From b5e73a228dcc85ec35d65c7ef282c7a8700c52ca Mon Sep 17 00:00:00 2001 From: luc Date: Thu, 28 Aug 2025 21:29:58 +0200 Subject: [PATCH] collapse into one blog page --- docs/{desktop-os => }/.authors.yml | 0 docs/desktop-os/index.md | 5 ----- docs/index.md | 8 +------- docs/{desktop-os => }/posts/01-void-install.md | 0 .../02-alpine-install.md} | 0 .../03-security-improvements.md} | 0 .../04-container-management-podman-runit.md} | 0 .../05-gentoo-openrc-install.md} | 0 .../06-maintaining-zfs-system.md} | 0 .../07-minimal-gui-river-pipewire-openrc.md} | 0 docs/server-os/.authors.yml | 13 ------------- docs/server-os/index.md | 5 ----- mkdocs.yml | 17 +++-------------- 13 files changed, 4 insertions(+), 44 deletions(-) rename docs/{desktop-os => }/.authors.yml (100%) delete mode 100644 docs/desktop-os/index.md rename docs/{desktop-os => }/posts/01-void-install.md (100%) rename docs/{server-os/posts/01-alpine-install.md => posts/02-alpine-install.md} (100%) rename docs/{server-os/posts/02-security-improvements.md => posts/03-security-improvements.md} (100%) rename docs/{server-os/posts/03-container-management-podman-runit.md => posts/04-container-management-podman-runit.md} (100%) rename docs/{desktop-os/posts/02-gentoo-openrc-install.md => posts/05-gentoo-openrc-install.md} (100%) rename docs/{server-os/posts/04-maintaining-zfs-system.md => posts/06-maintaining-zfs-system.md} (100%) rename docs/{desktop-os/posts/03-minimal-gui-river-pipewire-openrc.md => posts/07-minimal-gui-river-pipewire-openrc.md} (100%) delete mode 100644 docs/server-os/.authors.yml delete mode 100644 docs/server-os/index.md diff --git a/docs/desktop-os/.authors.yml b/docs/.authors.yml similarity index 100% rename from docs/desktop-os/.authors.yml rename to docs/.authors.yml diff --git a/docs/desktop-os/index.md b/docs/desktop-os/index.md deleted file mode 100644 index 80aa3e4..0000000 --- a/docs/desktop-os/index.md +++ /dev/null @@ -1,5 +0,0 @@ -# Desktop operating-system Blog - -The blog page of the topics particularly related to desktop operating systems. - ---- \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 627d540..0ad776a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,9 +1,3 @@ ---- -hide: - - navigation - - toc ---- - # Welcome to the blog of the Ampel organisation -Here we blog about various topics related to desktop and server operating systems. From base system installs to particular configuration of top level software. Always striving for simplicity, minimalism and security in each of these layers. \ No newline at end of file +Here we blog about various topics related to desktop and server operating systems. From base system installs to particular configuration of top level software. Always striving for simplicity, minimalism and security in each of these layers. diff --git a/docs/desktop-os/posts/01-void-install.md b/docs/posts/01-void-install.md similarity index 100% rename from docs/desktop-os/posts/01-void-install.md rename to docs/posts/01-void-install.md diff --git a/docs/server-os/posts/01-alpine-install.md b/docs/posts/02-alpine-install.md similarity index 100% rename from docs/server-os/posts/01-alpine-install.md rename to docs/posts/02-alpine-install.md diff --git a/docs/server-os/posts/02-security-improvements.md b/docs/posts/03-security-improvements.md similarity index 100% rename from docs/server-os/posts/02-security-improvements.md rename to docs/posts/03-security-improvements.md diff --git a/docs/server-os/posts/03-container-management-podman-runit.md b/docs/posts/04-container-management-podman-runit.md similarity index 100% rename from docs/server-os/posts/03-container-management-podman-runit.md rename to docs/posts/04-container-management-podman-runit.md diff --git a/docs/desktop-os/posts/02-gentoo-openrc-install.md b/docs/posts/05-gentoo-openrc-install.md similarity index 100% rename from docs/desktop-os/posts/02-gentoo-openrc-install.md rename to docs/posts/05-gentoo-openrc-install.md diff --git a/docs/server-os/posts/04-maintaining-zfs-system.md b/docs/posts/06-maintaining-zfs-system.md similarity index 100% rename from docs/server-os/posts/04-maintaining-zfs-system.md rename to docs/posts/06-maintaining-zfs-system.md diff --git a/docs/desktop-os/posts/03-minimal-gui-river-pipewire-openrc.md b/docs/posts/07-minimal-gui-river-pipewire-openrc.md similarity index 100% rename from docs/desktop-os/posts/03-minimal-gui-river-pipewire-openrc.md rename to docs/posts/07-minimal-gui-river-pipewire-openrc.md diff --git a/docs/server-os/.authors.yml b/docs/server-os/.authors.yml deleted file mode 100644 index c706248..0000000 --- a/docs/server-os/.authors.yml +++ /dev/null @@ -1,13 +0,0 @@ -authors: - luc: - name: "Luc" - description: "" - avatar: "https://git.ampel.dev/avatars/cbd8e77b1f18b62a6a8dc56124238153?size=512" - slug: "luc" - url: "https://git.ampel.dev/luc" - nils: - name: "Nils" - description: "" - avatar: "https://git.ampel.dev/avatars/caa9d4634a522b6e874804a280ce6d1001e4213b5e9db9ec965641269f862623?size=512" - slug: "nils" - url: "https://git.ampel.dev/nils" \ No newline at end of file diff --git a/docs/server-os/index.md b/docs/server-os/index.md deleted file mode 100644 index c59140e..0000000 --- a/docs/server-os/index.md +++ /dev/null @@ -1,5 +0,0 @@ -# Server operating-system Blog - -The blog page of the topics particularly related to server operating systems. - ---- \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 64a8c78..7b42522 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,8 +13,6 @@ theme: features: - navigation.instant - navigation.instant.progress - - navigation.indexes - - navigation.tabs - navigation.sections - toc.follow - search.suggest @@ -23,8 +21,8 @@ theme: - content.tabs.link - content.code.copy - content.code.annotate -# logo: assets/ampel-logo.png -# favicon: assets/ampel-logo.png + #logo: assets/ampel-logo.png + #favicon: assets/ampel-logo.png palette: - media: "(prefers-color-scheme: light)" scheme: default @@ -60,13 +58,4 @@ plugins: - search - tags - blog: - blog_dir: desktop-os - - blog: - blog_dir: server-os - -nav: - - 'Home': index.md - - 'Desktop OS': - - desktop-os/index.md - - 'Server OS': - - server-os/index.md + blog_dir: .