diff --git a/.sops.yaml b/.sops.yaml index f2a6579..3740488 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,5 +1,5 @@ keys: - - &london_system age1rr2u4kk5jc0zk5mmgcfzlddzz82u9ldqwnd2mkcspnps7pzegsms7fys7u + - &london_system age1ea4egj69ghxwyw9lyjfdp24qyvqj9ha5gcu36lqfp3d5yg6nmpgqm7w96m - &london_dala age19m7s6rl4l88nv0f7el70k9u9mv6fd0nq5nw5a3f6p3ffzch274lsksu3y7 - &camelot_system age1qp54d5gzvpyedcv26uckz7lmy2a48m27astawa62hkey59qgmg8setufp5 - &fuyuki_system age1lpk05l443jd7ra27hssvkc9xctpl990dy78tghmr4e8x7lfndy3qwhakwm diff --git a/configurations/london/hardware.nix b/configurations/london/hardware.nix index 58a070f..3494b90 100644 --- a/configurations/london/hardware.nix +++ b/configurations/london/hardware.nix @@ -12,34 +12,39 @@ # Volumes boot.initrd.luks.devices = { crypted-nixos = { - device = "/dev/disk/by-uuid/5a1ac4ae-d74f-4599-bc5a-fc0a3501a196"; + device = "/dev/disk/by-uuid/a4483eca-b546-4519-8591-c922a0d7732a"; preLVM = true; }; }; fileSystems = { "/" = { - device = "/dev/disk/by-uuid/8dd700f8-7bf7-426c-8869-d31687e343df"; + device = "/dev/disk/by-uuid/ce6814ce-808e-42c3-ba79-ae821b2935ba"; fsType = "ext4"; }; "/boot" = { - device = "/dev/disk/by-uuid/F2B6-C8CA"; + device = "/dev/disk/by-uuid/66D3-9AE4"; fsType = "vfat"; }; "/nix" = { - device = "/dev/disk/by-uuid/b7a643f6-a78e-4e32-a1a3-22b321465bf6"; + device = "/dev/disk/by-uuid/dc3a9b6f-da04-4e9b-a39d-a55300b5ecba"; fsType = "ext4"; }; "/home" = { - device = "/dev/disk/by-uuid/e26f6727-3712-4830-b8e8-fdbce5e3584b"; + device = "/dev/disk/by-uuid/5daead25-3e7b-4f40-9540-7283e2fc239d"; fsType = "ext4"; }; }; - swapDevices = [ { device = "/dev/disk/by-uuid/5fe5e76b-df3d-43ce-abf9-d2b63078df09"; } ]; + swapDevices = [ + { + device = "/dev/mapper/NixOS-swap"; + randomEncryption.enable = true; + } + ]; my.hardware.gpu = "nvidia"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/flake.nix b/flake.nix index 8a4a19f..de259db 100644 --- a/flake.nix +++ b/flake.nix @@ -143,6 +143,7 @@ colmena nixfmt-rfc-style nil + sops ]; }; } diff --git a/machines.nix b/machines.nix index 9987b89..b107329 100644 --- a/machines.nix +++ b/machines.nix @@ -3,7 +3,7 @@ nixpkgs = "unstable"; system = "x86_64-linux"; enableHomeManager = true; - stateVersion = "23.11"; + stateVersion = "24.05"; localDeployment = true; };