diff options
| author | Adrian Kummerlaender | 2024-03-14 15:28:43 +0100 |
|---|---|---|
| committer | Adrian Kummerlaender | 2024-03-14 15:29:27 +0100 |
| commit | 0a1d1db8ec1ac790343878faca99b2f4d6c5f900 (patch) | |
| tree | 2460b130d49a45543448f948ecbf23b4d23f6c94 | |
| parent | 7c27c82399da3a32db353a6ac22666d44fa54c57 (diff) | |
| download | nixos_system-0a1d1db8ec1ac790343878faca99b2f4d6c5f900.tar nixos_system-0a1d1db8ec1ac790343878faca99b2f4d6c5f900.tar.gz nixos_system-0a1d1db8ec1ac790343878faca99b2f4d6c5f900.tar.bz2 nixos_system-0a1d1db8ec1ac790343878faca99b2f4d6c5f900.tar.lz nixos_system-0a1d1db8ec1ac790343878faca99b2f4d6c5f900.tar.xz nixos_system-0a1d1db8ec1ac790343878faca99b2f4d6c5f900.tar.zst nixos_system-0a1d1db8ec1ac790343878faca99b2f4d6c5f900.zip | |
atlas: Adapt to new workstation
| -rw-r--r-- | host/atlas.nix | 3 | ||||
| -rw-r--r-- | host/hardware/atlas.nix | 35 | ||||
| -rw-r--r-- | host/software/server/wireguard.nix | 2 |
3 files changed, 13 insertions, 27 deletions
diff --git a/host/atlas.nix b/host/atlas.nix index e7ce146..4611ed7 100644 --- a/host/atlas.nix +++ b/host/atlas.nix @@ -19,7 +19,6 @@ hardware.nvidia.package = pkgs.linuxPackages.nvidia_x11; environment.systemPackages = with pkgs; [ - zenith-nvidia nvtop ]; @@ -86,5 +85,5 @@ users.users.gitlab-runner.isNormalUser = true; nix.settings.allowed-users = [ "gitlab-runner" ]; - system.stateVersion = "22.11"; + system.stateVersion = "23.11"; } diff --git a/host/hardware/atlas.nix b/host/hardware/atlas.nix index 1ed2dbb..61bca06 100644 --- a/host/hardware/atlas.nix +++ b/host/hardware/atlas.nix @@ -2,46 +2,33 @@ { boot = { - initrd = { - availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - kernelModules = [ ]; - }; + initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + initrd.kernelModules = [ ]; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; loader = { systemd-boot.enable = true; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; - }; - }; - - initrd = { - secrets = { - "/crypto_keyfile.bin" = null; - }; - # Enable swap on luks - luks.devices."luks-3a4818e8-af59-45de-9777-131c7a083d53" = { - device = "/dev/disk/by-uuid/3a4818e8-af59-45de-9777-131c7a083d53"; - keyFile = "/crypto_keyfile.bin"; - }; + efi.canTouchEfiVariables = true; }; }; fileSystems."/" = { - device = "/dev/disk/by-uuid/1e96455d-e8dd-4510-9e3d-e5f872d785f9"; + device = "/dev/disk/by-uuid/34f1948d-36a7-4c1f-95fe-5dc7dd53a46e"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-e3fe3335-82a9-4fcb-b45e-bee2f6382238".device = "/dev/disk/by-uuid/e3fe3335-82a9-4fcb-b45e-bee2f6382238"; + boot.initrd.luks.devices = { + "luks-f6c3a1a8-bc09-4fcd-a979-4fe82dc4dc71".device = "/dev/disk/by-uuid/f6c3a1a8-bc09-4fcd-a979-4fe82dc4dc71"; + "luks-49b6b8ab-1d8f-43d3-ba58-d548316f197a".device = "/dev/disk/by-uuid/49b6b8ab-1d8f-43d3-ba58-d548316f197a"; + }; - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/7ABB-606F"; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/D45E-0E82"; fsType = "vfat"; }; - swapDevices = [ { device = "/dev/disk/by-uuid/4951a94e-7a95-4148-b6d8-9f3f7d1c195f"; } ]; + swapDevices = [ { device = "/dev/disk/by-uuid/f198c957-dc39-4973-86c0-8fde06672ff9"; } ]; networking.useDHCP = lib.mkDefault true; diff --git a/host/software/server/wireguard.nix b/host/software/server/wireguard.nix index fac28cf..8b87f10 100644 --- a/host/software/server/wireguard.nix +++ b/host/software/server/wireguard.nix @@ -15,7 +15,7 @@ peers = [ { # atlas - publicKey = "PyEf1LU8cqfhzdPuiTz1itOX3Q87DwZjEDFjGKO8MHc=" + publicKey = "uuu0Ajabq6fkSdkw7SWLAt0cSYiXX0KWyj5amqVjqQw=" allowedIPs = [ "10.100.0.3" ]; } { # athena |