From a2f2ffb664d6e4dff4a42372edfeab378554ce81 Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 11 Jul 2024 12:50:48 -0400 Subject: [PATCH] Haven: officially retire Haven. Fs in the chat, pour one out, etc. Use Dimaga instead. --- flake.lock | 36 +++++++++---------- flake.nix | 9 ----- hosts/Dimaga/default.nix | 8 ++--- hosts/{Haven => Dimaga}/etc/apcupsd.conf | 0 .../start-services.sh} | 0 hosts/Pihole/default.nix | 2 +- hosts/{ => _retired}/Haven/default.nix | 0 .../Haven/hardware-configuration.nix | 0 modules/system/nix.nix | 4 +-- modules/users/media/default.nix | 2 +- nix-secrets | 2 +- 11 files changed, 26 insertions(+), 37 deletions(-) rename hosts/{Haven => Dimaga}/etc/apcupsd.conf (100%) rename hosts/{Haven/start-haven.sh => Dimaga/start-services.sh} (100%) rename hosts/{ => _retired}/Haven/default.nix (100%) rename hosts/{ => _retired}/Haven/hardware-configuration.nix (100%) diff --git a/flake.lock b/flake.lock index c05d359..1123996 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1720616874, - "narHash": "sha256-yyGDjpHCoG3zSCpN7yLpItu56508quscOrYlRUxb3Mw=", + "lastModified": 1720646128, + "narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f749fabeccb1587e4c1562e4f818cf33b8f77a51", + "rev": "c085b984ff2808bf322f375b10fea5a415a9c43d", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1718590005, - "narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=", - "rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80", + "lastModified": 1720626042, + "narHash": "sha256-w8JAk9Z3Fmkyway0VCjy/PtoBC6bGQVhNfTzFA98Pg8=", + "rev": "4bbdb2f5564b9b42bcaf0e1eec28325300f31c72", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/98d0249d5c7f5dcc1d2436c4829f073fca668f80.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4bbdb2f5564b9b42bcaf0e1eec28325300f31c72.tar.gz" }, "original": { "type": "tarball", @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1718778660, - "narHash": "sha256-1xP1r7tNTSJYYQr+6wwhkJk3P5REuN8WHARa7Re8T/0=", + "lastModified": 1720641872, + "narHash": "sha256-8M7l2GJkYpe5h51//rRocBXKgdz7QSkY94ZUgoUpjTY=", "ref": "release-2.90", - "rev": "376ecb80385642329ce274abda2da0bc7b7906c9", - "revCount": 89, + "rev": "acc5d87da90dd925101779ea27de60bdf3db339c", + "revCount": 91, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -233,11 +233,11 @@ "nix-secrets": { "flake": false, "locked": { - "lastModified": 1720640642, - "narHash": "sha256-Wo/t7ox4Qd5Xlh5r3iVGOySEkK8hsZoEm9Z33PoxJlw=", + "lastModified": 1720716326, + "narHash": "sha256-wflXa3lhKVZKf1BIZICaAohJEF0qbNgehEVgTLnbmO8=", "ref": "refs/heads/main", - "rev": "7bd1a9f5fc4bc1ebfdf3ceac7a19c6ce27d4a942", - "revCount": 51, + "rev": "e63567dbb3da53348fe83993d9f8a48d9dff2629", + "revCount": 52, "type": "git", "url": "file:./nix-secrets" }, @@ -296,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e275374..51dfdf6 100644 --- a/flake.nix +++ b/flake.nix @@ -96,15 +96,6 @@ ]; }; - Haven = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = defaultModules ++ [ - nixos-hardware.nixosModules.common-cpu-amd-pstate - nixos-hardware.nixosModules.common-gpu-amd - ./hosts/Haven - ]; - }; - Khanda = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = defaultModules ++ [ diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix index f528c78..ed16aad 100644 --- a/hosts/Dimaga/default.nix +++ b/hosts/Dimaga/default.nix @@ -10,9 +10,7 @@ let stateVersion = "24.11"; hostName = "Dimaga"; - start-services = pkgs.writeShellScriptBin "start-services" ( - builtins.readFile ../Haven/start-haven.sh - ); + start-services = pkgs.writeShellScriptBin "start-services" (builtins.readFile ./start-services.sh); services-root = "/storage/services"; @@ -111,7 +109,7 @@ in }; apcupsd = { enable = true; - configText = builtins.readFile ../Haven/etc/apcupsd.conf; + configText = builtins.readFile ./etc/apcupsd.conf; }; airsonic = { enable = true; @@ -179,7 +177,7 @@ in }; ssh = { enable = true; - ports = [ config.secrets.hosts.haven.ssh.port ]; + ports = [ config.secrets.hosts.dimaga.ssh.port ]; }; virtualization = { host = { diff --git a/hosts/Haven/etc/apcupsd.conf b/hosts/Dimaga/etc/apcupsd.conf similarity index 100% rename from hosts/Haven/etc/apcupsd.conf rename to hosts/Dimaga/etc/apcupsd.conf diff --git a/hosts/Haven/start-haven.sh b/hosts/Dimaga/start-services.sh similarity index 100% rename from hosts/Haven/start-haven.sh rename to hosts/Dimaga/start-services.sh diff --git a/hosts/Pihole/default.nix b/hosts/Pihole/default.nix index 405cbe1..316d7a0 100644 --- a/hosts/Pihole/default.nix +++ b/hosts/Pihole/default.nix @@ -26,7 +26,7 @@ in ]; services.ssh = { enable = true; - ports = [ config.secrets.hosts.haven.ssh.port ]; + ports = [ config.secrets.hosts.dimaga.ssh.port ]; }; users.aires.enable = true; }; diff --git a/hosts/Haven/default.nix b/hosts/_retired/Haven/default.nix similarity index 100% rename from hosts/Haven/default.nix rename to hosts/_retired/Haven/default.nix diff --git a/hosts/Haven/hardware-configuration.nix b/hosts/_retired/Haven/hardware-configuration.nix similarity index 100% rename from hosts/Haven/hardware-configuration.nix rename to hosts/_retired/Haven/hardware-configuration.nix diff --git a/modules/system/nix.nix b/modules/system/nix.nix index ebfdb3b..20f2c64 100644 --- a/modules/system/nix.nix +++ b/modules/system/nix.nix @@ -52,11 +52,11 @@ in registry = lib.mapAttrs (_: value: { flake = value; }) inputs; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - # Configure remote build machines (mainly Haven) + # Configure remote build machines # To enable remote builds for a specific host, add `nix.distributedBuilds = true;` to its config buildMachines = [ { - hostName = "haven"; + hostName = "dimaga"; systems = [ "x86_64-linux" "aarch64-linux" diff --git a/modules/users/media/default.nix b/modules/users/media/default.nix index be5d532..0aa9ff8 100644 --- a/modules/users/media/default.nix +++ b/modules/users/media/default.nix @@ -5,7 +5,7 @@ ... }: -# Define user for managing media on Haven +# Define user for managing media files let cfg = config.aux.system.users.media; in diff --git a/nix-secrets b/nix-secrets index 7bd1a9f..e63567d 160000 --- a/nix-secrets +++ b/nix-secrets @@ -1 +1 @@ -Subproject commit 7bd1a9f5fc4bc1ebfdf3ceac7a19c6ce27d4a942 +Subproject commit e63567dbb3da53348fe83993d9f8a48d9dff2629