diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-23 17:08:49 -0700 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-23 17:08:49 -0700 |
| commit | 0f6ff4bda2a2a55259626b1c9f6ea0bbd6c1e0b9 (patch) | |
| tree | 7e0d7b1292481c18c677e9e5306f0f3d53ccbe54 /machines | |
| parent | d9382806bc515fef56725bf26b0d19a5393e3464 (diff) | |
encrypted partitions on khad were annoying and useless
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/khad/configuration.nix | 12 | ||||
| -rw-r--r-- | machines/khad/hardware-configuration.nix | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix index b0f8490..3f46f5f 100644 --- a/machines/khad/configuration.nix +++ b/machines/khad/configuration.nix @@ -14,18 +14,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # Setup keyfile - boot.initrd.secrets = { - "/crypto_keyfile.bin" = null; - }; - - # Enable swap on luks - boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".device = "/dev/disk/by-uuid/12daadca-e9a9-413b-9286-017b3038e5ba"; - boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".keyFile = "/crypto_keyfile.bin"; - - boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".keyFile = "/crypto_keyfile.bin"; - - networking.hostName = "khad"; # Define your hostname. # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix index 9807d16..6e9d239 100644 --- a/machines/khad/hardware-configuration.nix +++ b/machines/khad/hardware-configuration.nix @@ -14,27 +14,23 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/360dd54b-c347-4ca9-adfd-3891414eeef6"; + { device = "/dev/disk/by-uuid/17bf776d-ed6d-4a80-831c-ddd65dec14fb"; fsType = "btrfs"; options = [ "subvol=@" ]; }; - boot.initrd.luks.devices."luks-f6d45986-2c3d-4c6a-bc73-6753d182fef9".device = "/dev/disk/by-uuid/f6d45986-2c3d-4c6a-bc73-6753d182fef9"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CE2A-4E2F"; + { device = "/dev/disk/by-uuid/83FA-1F6E"; fsType = "vfat"; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/ce569948-e98c-47e0-9a1b-1e33fc1f0664"; + { device = "/dev/disk/by-uuid/c6f221f0-f4c0-413e-821b-7363aa5c5f4c"; fsType = "btrfs"; }; - boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".device = "/dev/disk/by-uuid/02516df1-d33b-4c83-90f8-4be7b918132e"; - swapDevices = - [ { device = "/dev/disk/by-uuid/8f615eac-c1a1-48c6-8d34-8059732527c0"; } + [ { device = "/dev/disk/by-uuid/9b961057-79f7-4024-b1ec-16f9e8af7405"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking |