refactor: config/hosts => hosts
This commit is contained in:
23
README.md
23
README.md
@@ -10,7 +10,7 @@ Currently, this repository contains the nix code that builds:
|
|||||||
2. NixOS home server
|
2. NixOS home server
|
||||||
3. NixOS WSL
|
3. NixOS WSL
|
||||||
|
|
||||||
See [./config/hosts](./config/hosts) for details of each host.
|
See [./hosts](./hosts) for details of each host.
|
||||||
|
|
||||||
## Why NixOS & Flakes?
|
## 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,
|
This configuration uses [flake-parts](https://flake.parts/) for better flake organization and modularity,
|
||||||
enabling declarative host definitions and cleaner separation of concerns.
|
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
|
## Folder Structure
|
||||||
|
|
||||||
- `modules/` - custom NixOS modules
|
- `modules/` - custom NixOS modules
|
||||||
@@ -55,7 +38,7 @@ And more...
|
|||||||
- `profiles/desktop.nix` - desktop environment configuration
|
- `profiles/desktop.nix` - desktop environment configuration
|
||||||
- `profiles/server.nix` - server-specific configuration
|
- `profiles/server.nix` - server-specific configuration
|
||||||
- `profiles/wsl.nix` - WSL-specific configuration
|
- `profiles/wsl.nix` - WSL-specific configuration
|
||||||
- `config/hosts/<name>/` - host-specific configs
|
- `hosts/<name>/` - host-specific configs
|
||||||
- `flake/` - flake-parts modules
|
- `flake/` - flake-parts modules
|
||||||
- `flake/hosts.nix` - declarative host definitions
|
- `flake/hosts.nix` - declarative host definitions
|
||||||
- `lib/` - custom nix library
|
- `lib/` - custom nix library
|
||||||
@@ -63,4 +46,4 @@ And more...
|
|||||||
- `overlays/` - nixpkgs overlays
|
- `overlays/` - nixpkgs overlays
|
||||||
- `vars.nix` - my variables
|
- `vars.nix` - my variables
|
||||||
- `secrets/` - secrets managed by sops-nix. see [./secrets](./secrets) for details
|
- `secrets/` - secrets managed by sops-nix. see [./secrets](./secrets) for details
|
||||||
- `flake.nix` - flake entry
|
- `flake.nix` - flake entry
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ in
|
|||||||
type = lib.types.listOf lib.types.deferredModule;
|
type = lib.types.listOf lib.types.deferredModule;
|
||||||
default = (
|
default = (
|
||||||
lib.umport {
|
lib.umport {
|
||||||
paths = [ ../config/hosts/${name} ];
|
paths = [ ../hosts/${name} ];
|
||||||
extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
|
extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
|
||||||
recursive = true;
|
recursive = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user