Haven: officially retire Haven. Fs in the chat, pour one out, etc. Use Dimaga instead.
This commit is contained in:
parent
50c79e9e03
commit
a2f2ffb664
36
flake.lock
36
flake.lock
|
@ -138,11 +138,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720616874,
|
"lastModified": 1720646128,
|
||||||
"narHash": "sha256-yyGDjpHCoG3zSCpN7yLpItu56508quscOrYlRUxb3Mw=",
|
"narHash": "sha256-BivO5yIQukDlJL+1875Sqf3GuOPxZDdA48dYDi3PkL8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f749fabeccb1587e4c1562e4f818cf33b8f77a51",
|
"rev": "c085b984ff2808bf322f375b10fea5a415a9c43d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -179,11 +179,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718590005,
|
"lastModified": 1720626042,
|
||||||
"narHash": "sha256-fiWc1ZyMlTXXSjcmoEQ+NHhIgtcImPHszbOu5c515cU=",
|
"narHash": "sha256-w8JAk9Z3Fmkyway0VCjy/PtoBC6bGQVhNfTzFA98Pg8=",
|
||||||
"rev": "98d0249d5c7f5dcc1d2436c4829f073fca668f80",
|
"rev": "4bbdb2f5564b9b42bcaf0e1eec28325300f31c72",
|
||||||
"type": "tarball",
|
"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": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -200,11 +200,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718778660,
|
"lastModified": 1720641872,
|
||||||
"narHash": "sha256-1xP1r7tNTSJYYQr+6wwhkJk3P5REuN8WHARa7Re8T/0=",
|
"narHash": "sha256-8M7l2GJkYpe5h51//rRocBXKgdz7QSkY94ZUgoUpjTY=",
|
||||||
"ref": "release-2.90",
|
"ref": "release-2.90",
|
||||||
"rev": "376ecb80385642329ce274abda2da0bc7b7906c9",
|
"rev": "acc5d87da90dd925101779ea27de60bdf3db339c",
|
||||||
"revCount": 89,
|
"revCount": 91,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.lix.systems/lix-project/nixos-module"
|
"url": "https://git.lix.systems/lix-project/nixos-module"
|
||||||
},
|
},
|
||||||
|
@ -233,11 +233,11 @@
|
||||||
"nix-secrets": {
|
"nix-secrets": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720640642,
|
"lastModified": 1720716326,
|
||||||
"narHash": "sha256-Wo/t7ox4Qd5Xlh5r3iVGOySEkK8hsZoEm9Z33PoxJlw=",
|
"narHash": "sha256-wflXa3lhKVZKf1BIZICaAohJEF0qbNgehEVgTLnbmO8=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "7bd1a9f5fc4bc1ebfdf3ceac7a19c6ce27d4a942",
|
"rev": "e63567dbb3da53348fe83993d9f8a48d9dff2629",
|
||||||
"revCount": 51,
|
"revCount": 52,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:./nix-secrets"
|
"url": "file:./nix-secrets"
|
||||||
},
|
},
|
||||||
|
@ -296,11 +296,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720418205,
|
"lastModified": 1720542800,
|
||||||
"narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
|
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "655a58a72a6601292512670343087c2d75d859c1",
|
"rev": "feb2849fdeb70028c70d73b848214b00d324a497",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -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 {
|
Khanda = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = defaultModules ++ [
|
modules = defaultModules ++ [
|
||||||
|
|
|
@ -10,9 +10,7 @@ let
|
||||||
stateVersion = "24.11";
|
stateVersion = "24.11";
|
||||||
hostName = "Dimaga";
|
hostName = "Dimaga";
|
||||||
|
|
||||||
start-services = pkgs.writeShellScriptBin "start-services" (
|
start-services = pkgs.writeShellScriptBin "start-services" (builtins.readFile ./start-services.sh);
|
||||||
builtins.readFile ../Haven/start-haven.sh
|
|
||||||
);
|
|
||||||
|
|
||||||
services-root = "/storage/services";
|
services-root = "/storage/services";
|
||||||
|
|
||||||
|
@ -111,7 +109,7 @@ in
|
||||||
};
|
};
|
||||||
apcupsd = {
|
apcupsd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configText = builtins.readFile ../Haven/etc/apcupsd.conf;
|
configText = builtins.readFile ./etc/apcupsd.conf;
|
||||||
};
|
};
|
||||||
airsonic = {
|
airsonic = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -179,7 +177,7 @@ in
|
||||||
};
|
};
|
||||||
ssh = {
|
ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ports = [ config.secrets.hosts.haven.ssh.port ];
|
ports = [ config.secrets.hosts.dimaga.ssh.port ];
|
||||||
};
|
};
|
||||||
virtualization = {
|
virtualization = {
|
||||||
host = {
|
host = {
|
||||||
|
|
|
@ -26,7 +26,7 @@ in
|
||||||
];
|
];
|
||||||
services.ssh = {
|
services.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ports = [ config.secrets.hosts.haven.ssh.port ];
|
ports = [ config.secrets.hosts.dimaga.ssh.port ];
|
||||||
};
|
};
|
||||||
users.aires.enable = true;
|
users.aires.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -52,11 +52,11 @@ in
|
||||||
registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
|
registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
|
||||||
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
|
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
|
# To enable remote builds for a specific host, add `nix.distributedBuilds = true;` to its config
|
||||||
buildMachines = [
|
buildMachines = [
|
||||||
{
|
{
|
||||||
hostName = "haven";
|
hostName = "dimaga";
|
||||||
systems = [
|
systems = [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# Define user for managing media on Haven
|
# Define user for managing media files
|
||||||
let
|
let
|
||||||
cfg = config.aux.system.users.media;
|
cfg = config.aux.system.users.media;
|
||||||
in
|
in
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 7bd1a9f5fc4bc1ebfdf3ceac7a19c6ce27d4a942
|
Subproject commit e63567dbb3da53348fe83993d9f8a48d9dff2629
|
Loading…
Reference in a new issue