From f9308dda9edf19935d8153392cf33a4f057be82f Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Sat, 27 Dec 2025 17:58:48 +0800 Subject: [PATCH] refactor: config/hosts => hosts --- README.md | 23 +++---------------- flake/hosts.nix | 2 +- .../imxyy-nix-server/build.nix | 0 .../imxyy-nix-server/caddy.nix | 0 .../hosts => hosts}/imxyy-nix-server/code.nix | 0 .../imxyy-nix-server/docker.nix | 0 .../hosts => hosts}/imxyy-nix-server/efl.nix | 0 .../imxyy-nix-server/gitea.nix | 0 .../imxyy-nix-server/grafana.nix | 0 .../imxyy-nix-server/hardware.nix | 0 .../hosts => hosts}/imxyy-nix-server/home.nix | 0 .../imxyy-nix-server/homepage.nix | 0 .../imxyy-nix-server/immich.nix | 0 .../hosts => hosts}/imxyy-nix-server/mail.nix | 0 .../imxyy-nix-server/matrix.nix | 0 .../imxyy-nix-server/minecraft.nix | 0 .../imxyy-nix-server/minio.nix | 0 .../hosts => hosts}/imxyy-nix-server/net.nix | 0 .../imxyy-nix-server/nextcloud.nix | 0 .../imxyy-nix-server/nginx.nix | 0 .../imxyy-nix-server/nixos.nix | 0 .../hosts => hosts}/imxyy-nix-server/note.nix | 0 .../imxyy-nix-server/plant.nix | 0 .../hosts => hosts}/imxyy-nix-server/rss.nix | 0 .../imxyy-nix-server/samba.nix | 0 .../imxyy-nix-server/sshwifty.nix | 0 .../imxyy-nix-server/vault.nix | 0 .../hosts => hosts}/imxyy-nix-server/virt.nix | 0 .../hosts => hosts}/imxyy-nix-wsl/home.nix | 0 .../hosts => hosts}/imxyy-nix-wsl/nixos.nix | 0 .../imxyy-nix-x16/hardware.nix | 0 .../hosts => hosts}/imxyy-nix-x16/home.nix | 0 {config/hosts => hosts}/imxyy-nix-x16/net.nix | 0 .../hosts => hosts}/imxyy-nix-x16/nixos.nix | 0 .../hosts => hosts}/imxyy-nix/hardware.nix | 0 {config/hosts => hosts}/imxyy-nix/home.nix | 0 {config/hosts => hosts}/imxyy-nix/net.nix | 0 {config/hosts => hosts}/imxyy-nix/nixos.nix | 0 {config/hosts => hosts}/imxyy-nix/podman.nix | 0 {config/hosts => hosts}/imxyy-nix/virt.nix | 0 40 files changed, 4 insertions(+), 21 deletions(-) rename {config/hosts => hosts}/imxyy-nix-server/build.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/caddy.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/code.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/docker.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/efl.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/gitea.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/grafana.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/hardware.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/home.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/homepage.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/immich.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/mail.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/matrix.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/minecraft.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/minio.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/net.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/nextcloud.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/nginx.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/nixos.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/note.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/plant.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/rss.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/samba.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/sshwifty.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/vault.nix (100%) rename {config/hosts => hosts}/imxyy-nix-server/virt.nix (100%) rename {config/hosts => hosts}/imxyy-nix-wsl/home.nix (100%) rename {config/hosts => hosts}/imxyy-nix-wsl/nixos.nix (100%) rename {config/hosts => hosts}/imxyy-nix-x16/hardware.nix (100%) rename {config/hosts => hosts}/imxyy-nix-x16/home.nix (100%) rename {config/hosts => hosts}/imxyy-nix-x16/net.nix (100%) rename {config/hosts => hosts}/imxyy-nix-x16/nixos.nix (100%) rename {config/hosts => hosts}/imxyy-nix/hardware.nix (100%) rename {config/hosts => hosts}/imxyy-nix/home.nix (100%) rename {config/hosts => hosts}/imxyy-nix/net.nix (100%) rename {config/hosts => hosts}/imxyy-nix/nixos.nix (100%) rename {config/hosts => hosts}/imxyy-nix/podman.nix (100%) rename {config/hosts => hosts}/imxyy-nix/virt.nix (100%) diff --git a/README.md b/README.md index f4e10ae..8716e0c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Currently, this repository contains the nix code that builds: 2. NixOS home server 3. NixOS WSL -See [./config/hosts](./config/hosts) for details of each host. +See [./hosts](./hosts) for details of each host. ## Why NixOS & Flakes? @@ -25,23 +25,6 @@ As for Flakes, refer to This configuration uses [flake-parts](https://flake.parts/) for better flake organization and modularity, enabling declarative host definitions and cleaner separation of concerns. -## Components - -| | NixOS(Wayland) | -| ----------------------------- | :------------------------------------------- | -| **Window Manager** | Niri | -| **Desktop Shell** | Noctalia Shell | -| **Terminal Emulator** | Kitty | -| **Input method framework** | Fcitx5 | -| **Shell** | Zsh | -| **Netease Cloudmusic Player** | go-musicfox | -| **Media Player** | mpv | -| **Text Editor** | Neovim | -| **Fonts** | Noto Sans CJK & Jetbrains Mono & Nerd Font | -| **Filesystem** | Btrfs | - -And more... - ## Folder Structure - `modules/` - custom NixOS modules @@ -55,7 +38,7 @@ And more... - `profiles/desktop.nix` - desktop environment configuration - `profiles/server.nix` - server-specific configuration - `profiles/wsl.nix` - WSL-specific configuration -- `config/hosts//` - host-specific configs +- `hosts//` - host-specific configs - `flake/` - flake-parts modules - `flake/hosts.nix` - declarative host definitions - `lib/` - custom nix library @@ -63,4 +46,4 @@ And more... - `overlays/` - nixpkgs overlays - `vars.nix` - my variables - `secrets/` - secrets managed by sops-nix. see [./secrets](./secrets) for details -- `flake.nix` - flake entry \ No newline at end of file +- `flake.nix` - flake entry diff --git a/flake/hosts.nix b/flake/hosts.nix index 804492b..a02e2ef 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -51,7 +51,7 @@ in type = lib.types.listOf lib.types.deferredModule; default = ( lib.umport { - paths = [ ../config/hosts/${name} ]; + paths = [ ../hosts/${name} ]; extraExcludePredicate = path: lib.hasInfix "/_" (toString path); recursive = true; } diff --git a/config/hosts/imxyy-nix-server/build.nix b/hosts/imxyy-nix-server/build.nix similarity index 100% rename from config/hosts/imxyy-nix-server/build.nix rename to hosts/imxyy-nix-server/build.nix diff --git a/config/hosts/imxyy-nix-server/caddy.nix b/hosts/imxyy-nix-server/caddy.nix similarity index 100% rename from config/hosts/imxyy-nix-server/caddy.nix rename to hosts/imxyy-nix-server/caddy.nix diff --git a/config/hosts/imxyy-nix-server/code.nix b/hosts/imxyy-nix-server/code.nix similarity index 100% rename from config/hosts/imxyy-nix-server/code.nix rename to hosts/imxyy-nix-server/code.nix diff --git a/config/hosts/imxyy-nix-server/docker.nix b/hosts/imxyy-nix-server/docker.nix similarity index 100% rename from config/hosts/imxyy-nix-server/docker.nix rename to hosts/imxyy-nix-server/docker.nix diff --git a/config/hosts/imxyy-nix-server/efl.nix b/hosts/imxyy-nix-server/efl.nix similarity index 100% rename from config/hosts/imxyy-nix-server/efl.nix rename to hosts/imxyy-nix-server/efl.nix diff --git a/config/hosts/imxyy-nix-server/gitea.nix b/hosts/imxyy-nix-server/gitea.nix similarity index 100% rename from config/hosts/imxyy-nix-server/gitea.nix rename to hosts/imxyy-nix-server/gitea.nix diff --git a/config/hosts/imxyy-nix-server/grafana.nix b/hosts/imxyy-nix-server/grafana.nix similarity index 100% rename from config/hosts/imxyy-nix-server/grafana.nix rename to hosts/imxyy-nix-server/grafana.nix diff --git a/config/hosts/imxyy-nix-server/hardware.nix b/hosts/imxyy-nix-server/hardware.nix similarity index 100% rename from config/hosts/imxyy-nix-server/hardware.nix rename to hosts/imxyy-nix-server/hardware.nix diff --git a/config/hosts/imxyy-nix-server/home.nix b/hosts/imxyy-nix-server/home.nix similarity index 100% rename from config/hosts/imxyy-nix-server/home.nix rename to hosts/imxyy-nix-server/home.nix diff --git a/config/hosts/imxyy-nix-server/homepage.nix b/hosts/imxyy-nix-server/homepage.nix similarity index 100% rename from config/hosts/imxyy-nix-server/homepage.nix rename to hosts/imxyy-nix-server/homepage.nix diff --git a/config/hosts/imxyy-nix-server/immich.nix b/hosts/imxyy-nix-server/immich.nix similarity index 100% rename from config/hosts/imxyy-nix-server/immich.nix rename to hosts/imxyy-nix-server/immich.nix diff --git a/config/hosts/imxyy-nix-server/mail.nix b/hosts/imxyy-nix-server/mail.nix similarity index 100% rename from config/hosts/imxyy-nix-server/mail.nix rename to hosts/imxyy-nix-server/mail.nix diff --git a/config/hosts/imxyy-nix-server/matrix.nix b/hosts/imxyy-nix-server/matrix.nix similarity index 100% rename from config/hosts/imxyy-nix-server/matrix.nix rename to hosts/imxyy-nix-server/matrix.nix diff --git a/config/hosts/imxyy-nix-server/minecraft.nix b/hosts/imxyy-nix-server/minecraft.nix similarity index 100% rename from config/hosts/imxyy-nix-server/minecraft.nix rename to hosts/imxyy-nix-server/minecraft.nix diff --git a/config/hosts/imxyy-nix-server/minio.nix b/hosts/imxyy-nix-server/minio.nix similarity index 100% rename from config/hosts/imxyy-nix-server/minio.nix rename to hosts/imxyy-nix-server/minio.nix diff --git a/config/hosts/imxyy-nix-server/net.nix b/hosts/imxyy-nix-server/net.nix similarity index 100% rename from config/hosts/imxyy-nix-server/net.nix rename to hosts/imxyy-nix-server/net.nix diff --git a/config/hosts/imxyy-nix-server/nextcloud.nix b/hosts/imxyy-nix-server/nextcloud.nix similarity index 100% rename from config/hosts/imxyy-nix-server/nextcloud.nix rename to hosts/imxyy-nix-server/nextcloud.nix diff --git a/config/hosts/imxyy-nix-server/nginx.nix b/hosts/imxyy-nix-server/nginx.nix similarity index 100% rename from config/hosts/imxyy-nix-server/nginx.nix rename to hosts/imxyy-nix-server/nginx.nix diff --git a/config/hosts/imxyy-nix-server/nixos.nix b/hosts/imxyy-nix-server/nixos.nix similarity index 100% rename from config/hosts/imxyy-nix-server/nixos.nix rename to hosts/imxyy-nix-server/nixos.nix diff --git a/config/hosts/imxyy-nix-server/note.nix b/hosts/imxyy-nix-server/note.nix similarity index 100% rename from config/hosts/imxyy-nix-server/note.nix rename to hosts/imxyy-nix-server/note.nix diff --git a/config/hosts/imxyy-nix-server/plant.nix b/hosts/imxyy-nix-server/plant.nix similarity index 100% rename from config/hosts/imxyy-nix-server/plant.nix rename to hosts/imxyy-nix-server/plant.nix diff --git a/config/hosts/imxyy-nix-server/rss.nix b/hosts/imxyy-nix-server/rss.nix similarity index 100% rename from config/hosts/imxyy-nix-server/rss.nix rename to hosts/imxyy-nix-server/rss.nix diff --git a/config/hosts/imxyy-nix-server/samba.nix b/hosts/imxyy-nix-server/samba.nix similarity index 100% rename from config/hosts/imxyy-nix-server/samba.nix rename to hosts/imxyy-nix-server/samba.nix diff --git a/config/hosts/imxyy-nix-server/sshwifty.nix b/hosts/imxyy-nix-server/sshwifty.nix similarity index 100% rename from config/hosts/imxyy-nix-server/sshwifty.nix rename to hosts/imxyy-nix-server/sshwifty.nix diff --git a/config/hosts/imxyy-nix-server/vault.nix b/hosts/imxyy-nix-server/vault.nix similarity index 100% rename from config/hosts/imxyy-nix-server/vault.nix rename to hosts/imxyy-nix-server/vault.nix diff --git a/config/hosts/imxyy-nix-server/virt.nix b/hosts/imxyy-nix-server/virt.nix similarity index 100% rename from config/hosts/imxyy-nix-server/virt.nix rename to hosts/imxyy-nix-server/virt.nix diff --git a/config/hosts/imxyy-nix-wsl/home.nix b/hosts/imxyy-nix-wsl/home.nix similarity index 100% rename from config/hosts/imxyy-nix-wsl/home.nix rename to hosts/imxyy-nix-wsl/home.nix diff --git a/config/hosts/imxyy-nix-wsl/nixos.nix b/hosts/imxyy-nix-wsl/nixos.nix similarity index 100% rename from config/hosts/imxyy-nix-wsl/nixos.nix rename to hosts/imxyy-nix-wsl/nixos.nix diff --git a/config/hosts/imxyy-nix-x16/hardware.nix b/hosts/imxyy-nix-x16/hardware.nix similarity index 100% rename from config/hosts/imxyy-nix-x16/hardware.nix rename to hosts/imxyy-nix-x16/hardware.nix diff --git a/config/hosts/imxyy-nix-x16/home.nix b/hosts/imxyy-nix-x16/home.nix similarity index 100% rename from config/hosts/imxyy-nix-x16/home.nix rename to hosts/imxyy-nix-x16/home.nix diff --git a/config/hosts/imxyy-nix-x16/net.nix b/hosts/imxyy-nix-x16/net.nix similarity index 100% rename from config/hosts/imxyy-nix-x16/net.nix rename to hosts/imxyy-nix-x16/net.nix diff --git a/config/hosts/imxyy-nix-x16/nixos.nix b/hosts/imxyy-nix-x16/nixos.nix similarity index 100% rename from config/hosts/imxyy-nix-x16/nixos.nix rename to hosts/imxyy-nix-x16/nixos.nix diff --git a/config/hosts/imxyy-nix/hardware.nix b/hosts/imxyy-nix/hardware.nix similarity index 100% rename from config/hosts/imxyy-nix/hardware.nix rename to hosts/imxyy-nix/hardware.nix diff --git a/config/hosts/imxyy-nix/home.nix b/hosts/imxyy-nix/home.nix similarity index 100% rename from config/hosts/imxyy-nix/home.nix rename to hosts/imxyy-nix/home.nix diff --git a/config/hosts/imxyy-nix/net.nix b/hosts/imxyy-nix/net.nix similarity index 100% rename from config/hosts/imxyy-nix/net.nix rename to hosts/imxyy-nix/net.nix diff --git a/config/hosts/imxyy-nix/nixos.nix b/hosts/imxyy-nix/nixos.nix similarity index 100% rename from config/hosts/imxyy-nix/nixos.nix rename to hosts/imxyy-nix/nixos.nix diff --git a/config/hosts/imxyy-nix/podman.nix b/hosts/imxyy-nix/podman.nix similarity index 100% rename from config/hosts/imxyy-nix/podman.nix rename to hosts/imxyy-nix/podman.nix diff --git a/config/hosts/imxyy-nix/virt.nix b/hosts/imxyy-nix/virt.nix similarity index 100% rename from config/hosts/imxyy-nix/virt.nix rename to hosts/imxyy-nix/virt.nix