refactor: 重构为三设备架构,zsh 迁移至 fish
- 新增 darwinConfigurations: mac-mini, macbook-air (aarch64-darwin) - WSL 统一用户名为 imbytecat,主机名改为 awesome-* 系列 - zsh 全面迁移至 fish (abbrs, 内置补全/高亮, zoxide --cmd cd) - 激活 nix-darwin 模块: Homebrew, 系统偏好, Touch ID sudo - 移除 bare/standalone 配置及 catppuccin nixosModule from mkDarwin
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{
|
||||
description = "Multi-platform Nix configuration — NixOS / nix-darwin / standalone Home Manager";
|
||||
description = "Multi-platform Nix configuration — nix-darwin / NixOS-WSL";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
@@ -35,42 +35,34 @@
|
||||
mylib = import ./lib { inherit inputs; };
|
||||
in
|
||||
{
|
||||
# ── NixOS hosts ────────────────────────────────────
|
||||
# ── macOS hosts ─────────────────────────────────────
|
||||
darwinConfigurations = {
|
||||
mac-mini = mylib.mkDarwin {
|
||||
hostname = "awesome-mac-mini";
|
||||
system = "aarch64-darwin";
|
||||
username = "imbytecat";
|
||||
extraModules = [ ./hosts/mac-mini ];
|
||||
};
|
||||
|
||||
macbook-air = mylib.mkDarwin {
|
||||
hostname = "awesome-macbook-air";
|
||||
system = "aarch64-darwin";
|
||||
username = "imbytecat";
|
||||
extraModules = [ ./hosts/macbook-air ];
|
||||
};
|
||||
};
|
||||
|
||||
# ── NixOS hosts (WSL on Windows PC) ─────────────────
|
||||
nixosConfigurations = {
|
||||
wsl = mylib.mkNixos {
|
||||
hostname = "nixos-wsl";
|
||||
hostname = "awesome-wsl";
|
||||
system = "x86_64-linux";
|
||||
username = "dev";
|
||||
username = "imbytecat";
|
||||
extraModules = [
|
||||
inputs.nixos-wsl.nixosModules.default
|
||||
./hosts/wsl
|
||||
];
|
||||
};
|
||||
|
||||
bare = mylib.mkNixos {
|
||||
hostname = "nixos";
|
||||
system = "x86_64-linux";
|
||||
username = "dev";
|
||||
extraModules = [ ./hosts/bare ];
|
||||
};
|
||||
};
|
||||
|
||||
# ── macOS hosts (uncomment when ready) ─────────────
|
||||
# darwinConfigurations = {
|
||||
# macbook = mylib.mkDarwin {
|
||||
# hostname = "macbook";
|
||||
# system = "aarch64-darwin";
|
||||
# username = "imbytecat";
|
||||
# extraModules = [ ./hosts/macbook ];
|
||||
# };
|
||||
# };
|
||||
|
||||
# ── Standalone Home Manager (non-NixOS / non-Darwin) ─
|
||||
homeConfigurations = {
|
||||
"dev" = mylib.mkHome {
|
||||
system = "x86_64-linux";
|
||||
username = "dev";
|
||||
};
|
||||
};
|
||||
|
||||
# ── Packages ────────────────────────────────────────
|
||||
|
||||
Reference in New Issue
Block a user