diff options
Diffstat (limited to 'hosts')
-rw-r--r-- | hosts/luna/disks.nix | 53 | ||||
-rw-r--r-- | hosts/luna/hardware.nix | 55 | ||||
-rw-r--r-- | hosts/phobos/disks.nix | 40 | ||||
-rw-r--r-- | hosts/phobos/hardware.nix | 42 | ||||
-rw-r--r-- | hosts/vm/disks.nix | 45 | ||||
-rw-r--r-- | hosts/vm/hardware.nix | 46 |
6 files changed, 150 insertions, 131 deletions
diff --git a/hosts/luna/disks.nix b/hosts/luna/disks.nix new file mode 100644 index 0000000..753711c --- /dev/null +++ b/hosts/luna/disks.nix @@ -0,0 +1,53 @@ +{ config, lib, inputs, pkgs, modulesPath, ... }: +{ + fileSystems."/" = { + device = "none"; + fsType = "tmpfs"; + }; + + boot.initrd.luks.devices."encrypted_boot" = { + device = "/dev/disk/by-uuid/4f5ba100-5c69-49ce-b0cf-2f219a5e9e51"; + preLVM = true; + }; + + fileSystems."/boot" = { + device = "/dev/mapper/encrypted_boot"; + fsType = "vfat"; + }; + + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/BD51-1431"; + fsType = "vfat"; + }; + + boot.initrd.luks.devices."encrypted_nix".device = "/dev/disk/by-uuid/596e43d3-ccda-4f06-bce9-58d6a8c0dd79"; + + fileSystems."/nix" = { + device = "/dev/mapper/encrypted_nix"; + fsType = "btrfs"; + neededForBoot = true; + options = [ "subvol=nix" "compress-force=zstd" "noatime" ]; + }; + + boot.initrd.luks.devices."encrypted_home_and_persist".device = "/dev/disk/by-uuid/47a8ddde-1237-4a0f-84c4-f17fbd22ea3f"; + + fileSystems."/persist" = { + device = "/dev/mapper/encrypted_home_and_persist"; + fsType = "btrfs"; + neededForBoot = true; + options = [ "subvol=persist" "compress-force=zstd" "noatime" ]; + }; + + fileSystems."/home" = { + device = "/dev/mapper/encrypted_home_and_persist"; + fsType = "btrfs"; + options = [ "subvol=home" "compress-force=zstd" ]; + }; + + services.btrfs.autoScrub.enable = true; + + swapDevices = [ ]; + + zramSwap.enable = true; + +} diff --git a/hosts/luna/hardware.nix b/hosts/luna/hardware.nix index 1d87654..da1416a 100644 --- a/hosts/luna/hardware.nix +++ b/hosts/luna/hardware.nix @@ -1,9 +1,11 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, inputs, pkgs, modulesPath, ... }: let powerMode = "schedutil"; in { - imports = [ ]; + imports = [ + ./disks.nix + ]; boot = { initrd = { @@ -15,52 +17,6 @@ in kernelParams = [ "net.ifnames=0" "biosdevname=0" "iomem=relaxed" "mitigations=off" ]; }; - fileSystems."/" = { - device = "none"; - fsType = "tmpfs"; - }; - - boot.initrd.luks.devices."encrypted_boot" = { - device = "/dev/disk/by-uuid/4f5ba100-5c69-49ce-b0cf-2f219a5e9e51"; - preLVM = true; - }; - - fileSystems."/boot" = { - device = "/dev/mapper/encrypted_boot"; - fsType = "vfat"; - }; - - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/BD51-1431"; - fsType = "vfat"; - }; - - boot.initrd.luks.devices."encrypted_nix".device = "/dev/disk/by-uuid/596e43d3-ccda-4f06-bce9-58d6a8c0dd79"; - - fileSystems."/nix" = { - device = "/dev/mapper/encrypted_nix"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=nix" "compress-force=zstd" "noatime" ]; - }; - - boot.initrd.luks.devices."encrypted_home_and_persist".device = "/dev/disk/by-uuid/47a8ddde-1237-4a0f-84c4-f17fbd22ea3f"; - - fileSystems."/persist" = { - device = "/dev/mapper/encrypted_home_and_persist"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=persist" "compress-force=zstd" "noatime" ]; - }; - - fileSystems."/home" = { - device = "/dev/mapper/encrypted_home_and_persist"; - fsType = "btrfs"; - options = [ "subvol=home" "compress-force=zstd" ]; - }; - - swapDevices = [ ]; - powerManagement.cpuFreqGovernor = powerMode; services = { @@ -94,7 +50,4 @@ in }; }; - services.btrfs.autoScrub.enable = true; - - zramSwap.enable = true; } diff --git a/hosts/phobos/disks.nix b/hosts/phobos/disks.nix new file mode 100644 index 0000000..9f1906e --- /dev/null +++ b/hosts/phobos/disks.nix @@ -0,0 +1,40 @@ +{ config, lib, inputs, pkgs, modulesPath, ... }: +{ + fileSystems."/" = { + device = "none"; + fsType = "tmpfs"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/0A8B-3968"; + fsType = "vfat"; + }; + + boot.initrd.luks.devices."encrypted_root".device = "/dev/disk/by-uuid/095dc267-9281-4535-9491-b3fcded614a8"; + + fileSystems."/persist" = { + device = "/dev/mapper/encrypted_root"; + fsType = "btrfs"; + neededForBoot = true; + options = [ "subvol=persist" "compress-force=zstd" "noatime" ]; + }; + + fileSystems."/nix" = { + device = "/dev/mapper/encrypted_root"; + fsType = "btrfs"; + options = [ "subvol=nix" "compress-force=zstd" "noatime" ]; + }; + + fileSystems."/home" = { + device = "/dev/mapper/encrypted_root"; + fsType = "btrfs"; + options = [ "subvol=home" "compress-force=zstd" ]; + }; + + swapDevices = [ ]; + + services.btrfs.autoScrub.enable = true; + + zramSwap.enable = true; + +} diff --git a/hosts/phobos/hardware.nix b/hosts/phobos/hardware.nix index 0224fc5..cf95556 100644 --- a/hosts/phobos/hardware.nix +++ b/hosts/phobos/hardware.nix @@ -1,9 +1,11 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, inputs, pkgs, modulesPath, ... }: let powerMode = "performance"; in { - imports = [ ]; + imports = [ + ./disks.nix + ]; boot = { initrd = { @@ -15,39 +17,6 @@ in kernelParams = [ "net.ifnames=0" "biosdevname=0" "iomem=relaxed" "mitigations=off" ]; }; - fileSystems."/" = { - device = "none"; - fsType = "tmpfs"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/0A8B-3968"; - fsType = "vfat"; - }; - - boot.initrd.luks.devices."encrypted_root".device = "/dev/disk/by-uuid/095dc267-9281-4535-9491-b3fcded614a8"; - - fileSystems."/persist" = { - device = "/dev/mapper/encrypted_root"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=persist" "compress-force=zstd" "noatime" ]; - }; - - fileSystems."/nix" = { - device = "/dev/mapper/encrypted_root"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress-force=zstd" "noatime" ]; - }; - - fileSystems."/home" = { - device = "/dev/mapper/encrypted_root"; - fsType = "btrfs"; - options = [ "subvol=home" "compress-force=zstd" ]; - }; - - swapDevices = [ ]; - powerManagement.cpuFreqGovernor = powerMode; services = { @@ -85,7 +54,4 @@ in }; }; - services.btrfs.autoScrub.enable = true; - - zramSwap.enable = true; } diff --git a/hosts/vm/disks.nix b/hosts/vm/disks.nix new file mode 100644 index 0000000..cabed80 --- /dev/null +++ b/hosts/vm/disks.nix @@ -0,0 +1,45 @@ +{ config, lib, inputs, pkgs, modulesPath, ... }: +{ + fileSystems."/" = { + device = "none"; + fsType = "tmpfs"; + }; + + boot.initrd.luks.devices."encrypted_boot".device = "/dev/disk/by-partlabel/boot"; + + fileSystems."/boot" = { + device = "/dev/mapper/encrypted_boot"; + fsType = "vfat"; + }; + + fileSystems."/boot/efi" = { + device = "/dev/disk/by-partlabel/efi"; + fsType = "vfat"; + }; + + boot.initrd.luks.devices."encrypted_root".device = "/dev/disk/by-partlabel/root"; + + fileSystems."/nix" = { + device = "/dev/mapper/encrypted_root"; + fsType = "btrfs"; + options = [ "subvol=nix" "compress-force=zstd" "noatime" ]; + }; + + fileSystems."/persist" = { + device = "/dev/mapper/encrypted_root"; + fsType = "btrfs"; + neededForBoot = true; + options = [ "subvol=persist" "compress-force=zstd" "noatime" ]; + }; + + fileSystems."/home" = { + device = "/dev/mapper/encrypted_root"; + fsType = "btrfs"; + options = [ "subvol=home" "compress-force=zstd" ]; + }; + + swapDevices = [ ]; + + zramSwap.enable = true; + +} diff --git a/hosts/vm/hardware.nix b/hosts/vm/hardware.nix index facdb18..7b04d70 100644 --- a/hosts/vm/hardware.nix +++ b/hosts/vm/hardware.nix @@ -1,6 +1,8 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, inputs, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = [ + ./disks.nix + ]; boot = { initrd = { @@ -13,46 +15,6 @@ kernelParams = [ "net.ifnames=0" "biosdevname=0" "mitigations=off" ]; }; - fileSystems."/" = { - device = "none"; - fsType = "tmpfs"; - }; - - boot.initrd.luks.devices."encrypted_boot".device = "/dev/disk/by-partlabel/boot"; - - fileSystems."/boot" = { - device = "/dev/mapper/encrypted_boot"; - fsType = "vfat"; - }; - - fileSystems."/boot/efi" = { - device = "/dev/disk/by-partlabel/efi"; - fsType = "vfat"; - }; - - boot.initrd.luks.devices."encrypted_root".device = "/dev/disk/by-partlabel/root"; - - fileSystems."/nix" = { - device = "/dev/mapper/encrypted_root"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress-force=zstd" "noatime" ]; - }; - - fileSystems."/persist" = { - device = "/dev/mapper/encrypted_root"; - fsType = "btrfs"; - neededForBoot = true; - options = [ "subvol=persist" "compress-force=zstd" "noatime" ]; - }; - - fileSystems."/home" = { - device = "/dev/mapper/encrypted_root"; - fsType = "btrfs"; - options = [ "subvol=home" "compress-force=zstd" ]; - }; - - swapDevices = [ ]; - services.xserver = { # Enable touchpad support (enabled default in most desktopManager). libinput.enable = true; |