diff --git a/nixos/hosts/gandalf/config/disks.nix b/.archive/hosts/gandalf/config/disks.nix similarity index 100% rename from nixos/hosts/gandalf/config/disks.nix rename to .archive/hosts/gandalf/config/disks.nix diff --git a/nixos/hosts/gandalf/config/incus-preseed.nix b/.archive/hosts/gandalf/config/incus-preseed.nix similarity index 100% rename from nixos/hosts/gandalf/config/incus-preseed.nix rename to .archive/hosts/gandalf/config/incus-preseed.nix diff --git a/nixos/hosts/gandalf/config/samba-config.nix b/.archive/hosts/gandalf/config/samba-config.nix similarity index 100% rename from nixos/hosts/gandalf/config/samba-config.nix rename to .archive/hosts/gandalf/config/samba-config.nix diff --git a/nixos/hosts/gandalf/config/sanoid.nix b/.archive/hosts/gandalf/config/sanoid.nix similarity index 100% rename from nixos/hosts/gandalf/config/sanoid.nix rename to .archive/hosts/gandalf/config/sanoid.nix diff --git a/nixos/hosts/gandalf/default.nix b/.archive/hosts/gandalf/default.nix similarity index 100% rename from nixos/hosts/gandalf/default.nix rename to .archive/hosts/gandalf/default.nix diff --git a/nixos/hosts/gandalf/secrets.sops.yaml b/.archive/hosts/gandalf/secrets.sops.yaml similarity index 100% rename from nixos/hosts/gandalf/secrets.sops.yaml rename to .archive/hosts/gandalf/secrets.sops.yaml diff --git a/flake.nix b/flake.nix index eb3798d..8c5b735 100644 --- a/flake.nix +++ b/flake.nix @@ -183,15 +183,20 @@ }; in { - "varda" = mkNixosConfig { - # Arm64 cax21 @ Hetzner - # forgejo server - hostname = "varda"; - system = "aarch64-linux"; + "shadowfax" = mkNixosConfig { + # Pro WS WRX80E-SAGE SE WIFI - AMD Ryzen Threadripper PRO 3955WX 16-Cores + # Workloads server + hostname = "shadowfax"; + system = "x86_64-linux"; + disabledModules = [ "services/web-servers/minio.nix" ]; hardwareModules = [ - ./nixos/profiles/hw-hetzner-cax.nix + lix-module.nixosModules.default + ./nixos/profiles/hw-threadripperpro.nix ]; profileModules = [ + vscode-server.nixosModules.default + "${nixpkgs-unstable}/nixos/modules/services/web-servers/minio.nix" + ./nixos/profiles/role-dev.nix ./nixos/profiles/role-server.nix { home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; } ]; @@ -214,42 +219,19 @@ ]; }; - "shadowfax" = mkNixosConfig { - # Pro WS WRX80E-SAGE SE WIFI - AMD Ryzen Threadripper PRO 3955WX 16-Cores - # Workloads server - hostname = "shadowfax"; - system = "x86_64-linux"; - disabledModules = [ "services/web-servers/minio.nix" ]; + "varda" = mkNixosConfig { + # Arm64 cax21 @ Hetzner + # forgejo server + hostname = "varda"; + system = "aarch64-linux"; hardwareModules = [ - lix-module.nixosModules.default - ./nixos/profiles/hw-threadripperpro.nix + ./nixos/profiles/hw-hetzner-cax.nix ]; profileModules = [ - vscode-server.nixosModules.default - "${nixpkgs-unstable}/nixos/modules/services/web-servers/minio.nix" - ./nixos/profiles/role-dev.nix ./nixos/profiles/role-server.nix { home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; } ]; }; - - "gandalf" = mkNixosConfig { - # X9DRi-LN4+/X9DR3-LN4+ - Intel(R) Xeon(R) CPU E5-2650 v2 - # NAS - hostname = "gandalf"; - system = "x86_64-linux"; - hardwareModules = [ - lix-module.nixosModules.default - ./nixos/profiles/hw-supermicro.nix - ]; - profileModules = [ - vscode-server.nixosModules.default - ./nixos/profiles/role-dev.nix - ./nixos/profiles/role-server.nix - { home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; } - ]; - }; - }; # Convenience output that aggregates the outputs for home, nixos. diff --git a/nixos/home/jahanson/global.nix b/nixos/home/jahanson/global.nix index 8045262..1570374 100644 --- a/nixos/home/jahanson/global.nix +++ b/nixos/home/jahanson/global.nix @@ -25,12 +25,14 @@ with config; EDITOR = "vim"; }; + # Home Manager + ## Tasks, env, and secrets management. + programs.mise = { + enable = true; + package = pkgs.unstable.mise; + }; + home = { - # Tasks, env, and secrets management. - programs.mise = { - enable = true; - package = pkgs.unstable.mise; - }; # Install these packages for my user packages = with pkgs; [