Merge branch 'main' of ssh://code.8bitbuddhism.com/aires/nix-configuration
This commit is contained in:
commit
c7f0e2eb24
|
@ -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"
|
||||
},
|
||||
|
|
|
@ -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 ++ [
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 7bd1a9f5fc4bc1ebfdf3ceac7a19c6ce27d4a942
|
||||
Subproject commit e63567dbb3da53348fe83993d9f8a48d9dff2629
|
Loading…
Reference in a new issue