diff options
Diffstat (limited to '')
| -rw-r--r-- | machines/bree.nix (renamed from machines/nixos/x86_64-linux/bree.nix) | 22 | ||||
| -rw-r--r-- | machines/iso.nix (renamed from machines/nixos/x86_64-linux/iso.nix) | 6 | ||||
| -rw-r--r-- | machines/nixos/x86_64-linux/argonath.nix | 25 | ||||
| -rw-r--r-- | machines/rivendell.nix (renamed from machines/nixos/x86_64-linux/rivendell.nix) | 32 |
4 files changed, 30 insertions, 55 deletions
diff --git a/machines/nixos/x86_64-linux/bree.nix b/machines/bree.nix index 9c9177d..e4cd443 100644 --- a/machines/nixos/x86_64-linux/bree.nix +++ b/machines/bree.nix @@ -1,22 +1,22 @@ { lib, config, ... }: { imports = [ - ../../../profiles/cgroups.nix - ../../../profiles/defaults.nix - ../../../profiles/disk/basic-vm.nix - ../../../profiles/hardware/synology-vm.nix - ../../../profiles/home-manager.nix - ../../../profiles/server.nix - ../../../profiles/users/fcuny.nix - ../../../profiles/wireguard.nix + ../profiles/cgroups.nix + ../profiles/defaults.nix + ../profiles/disk/basic-vm.nix + ../profiles/hardware/synology-vm.nix + ../profiles/home-manager.nix + ../profiles/server.nix + ../profiles/users/fcuny.nix + ../profiles/wireguard.nix ]; networking.hostName = "bree"; networking.useDHCP = lib.mkDefault true; systemd.network.wait-online.anyInterface = lib.mkDefault config.networking.useDHCP; - age.secrets.disk-unlock-key.file = ../../../secrets/bree/disk-unlock-key.age; - age.secrets.disk-passphrase.file = ../../../secrets/bree/disk-passphrase.age; + age.secrets.disk-unlock-key.file = ../secrets/bree/disk-unlock-key.age; + age.secrets.disk-passphrase.file = ../secrets/bree/disk-passphrase.age; services.remoteDiskUnlock = { enable = true; @@ -31,7 +31,7 @@ home-manager.users.fcuny = { imports = [ - ../../../home/profiles/minimal.nix + ../home/profiles/minimal.nix ]; }; } diff --git a/machines/nixos/x86_64-linux/iso.nix b/machines/iso.nix index fc9c4fa..a636508 100644 --- a/machines/nixos/x86_64-linux/iso.nix +++ b/machines/iso.nix @@ -4,8 +4,8 @@ imports = [ "${modulesPath}/installer/cd-dvd/channel.nix" "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" - ../../../profiles/home-manager.nix - ../../../profiles/users/fcuny.nix + ../profiles/home-manager.nix + ../profiles/users/fcuny.nix ]; boot.loader.grub.efiSupport = true; @@ -18,7 +18,7 @@ home-manager.users.fcuny = { imports = [ - ../../../home/profiles/minimal.nix + ../home/profiles/minimal.nix ]; }; } diff --git a/machines/nixos/x86_64-linux/argonath.nix b/machines/nixos/x86_64-linux/argonath.nix deleted file mode 100644 index 3dda772..0000000 --- a/machines/nixos/x86_64-linux/argonath.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ ... }: -{ - imports = [ - ../../../profiles/acme.nix - ../../../profiles/cgroups.nix - ../../../profiles/defaults.nix - ../../../profiles/disk/basic-vm.nix - ../../../profiles/hardware/do-droplet.nix - ../../../profiles/home-manager.nix - ../../../profiles/reverse-proxy.nix - ../../../profiles/server.nix - ../../../profiles/wireguard.nix - ../../../profiles/users/fcuny.nix - ]; - - networking.hostName = "argonath"; - - system.stateVersion = "25.05"; # Did you read the comment? - - home-manager.users.fcuny = { - imports = [ - ../../../home/profiles/minimal.nix - ]; - }; -} diff --git a/machines/nixos/x86_64-linux/rivendell.nix b/machines/rivendell.nix index 0bd799c..4940ea3 100644 --- a/machines/nixos/x86_64-linux/rivendell.nix +++ b/machines/rivendell.nix @@ -1,21 +1,21 @@ { lib, config, ... }: { imports = [ - ../../../profiles/authelia.nix - ../../../profiles/cgroups.nix - ../../../profiles/defaults.nix - ../../../profiles/disk/btrfs-on-luks.nix - ../../../profiles/git-server.nix - ../../../profiles/hardware/framework-desktop.nix - ../../../profiles/home-manager.nix - ../../../profiles/makemkv.nix - ../../../profiles/miniflux.nix - ../../../profiles/remote-unlock.nix - ../../../profiles/restic-backup.nix - ../../../profiles/server.nix - ../../../profiles/users/builder.nix - ../../../profiles/users/fcuny.nix - ../../../profiles/wireguard.nix + ../profiles/authelia.nix + ../profiles/cgroups.nix + ../profiles/defaults.nix + ../profiles/disk/btrfs-on-luks.nix + ../profiles/git-server.nix + ../profiles/hardware/framework-desktop.nix + ../profiles/home-manager.nix + ../profiles/makemkv.nix + ../profiles/miniflux.nix + ../profiles/remote-unlock.nix + ../profiles/restic-backup.nix + ../profiles/server.nix + ../profiles/users/builder.nix + ../profiles/users/fcuny.nix + ../profiles/wireguard.nix ]; networking.hostName = "rivendell"; @@ -72,7 +72,7 @@ home-manager.users.fcuny = { imports = [ - ../../../home/profiles/minimal.nix + ../home/profiles/minimal.nix ]; }; } |
