diff --git a/hosts/supernova/default.nix b/hosts/supernova/default.nix index c433aeb..959bf30 100644 --- a/hosts/supernova/default.nix +++ b/hosts/supernova/default.nix @@ -18,18 +18,15 @@ system.stateVersion = "24.05"; # FDE stuff - networking.firewall.allowedTCPPorts = [ 2222 ]; - systemd.services.sshd.wantedBy = [ "cryptsetup.target" ]; + + boot.kernelParams = [ "ip=dhcp" ]; + boot.loader.timeout = 2; networking.useDHCP = true; boot.initrd = { - availableKernelModules = [ "virtio-pci" ]; + availableKernelModules = [ "r8169" ]; + systemd.users.root.shell = "/bin/systemd-tty-ask-password-agent"; secrets = {"/root/initrd-ssh-key" = "/root/initrd-ssh-key";}; network = { - - #udhcpc.enable = true; - #flushBeforeStage2 = true; - - enable = true; ssh = { enable = true; @@ -43,7 +40,5 @@ # echo 'cryptsetup-askpass' >> /root/.profile #''; }; - }; - - + }; } diff --git a/hosts/supernova/hardware-configuration.nix b/hosts/supernova/hardware-configuration.nix index 626e5ad..500f43d 100644 --- a/hosts/supernova/hardware-configuration.nix +++ b/hosts/supernova/hardware-configuration.nix @@ -17,7 +17,7 @@ boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/db8a5cf9-c54b-4e6a-b3f9-e6323eb962a6"; fileSystems."/" = - { device = "/dev/disk/by-uuid/4f7afb2d-a730-4a0c-a9e4-92d75ebd1540"; + { device = "/dev/mapper/vg-root"; fsType = "btrfs"; }; @@ -28,7 +28,7 @@ }; swapDevices = - [ { device = "/dev/disk/by-uuid/539bfdd3-6f33-4206-aa4d-7d06f3f91568"; } + [ { device = "/dev/mapper/vg-swap"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking