diff --git a/hosts/hades/boot-config.nix b/hosts/hades/boot-config.nix index 79945aa..944bb61 100644 --- a/hosts/hades/boot-config.nix +++ b/hosts/hades/boot-config.nix @@ -8,35 +8,46 @@ # Enable swap on luks boot = { - loader = { - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; - }; - #systemd-boot = { - #enable = false; - #configurationLimit = 10; - #}; - grub = { - enable = true; - efiSupport = true; - #efiInstallAsRemovable = true; - device = "/dev/sda"; - useOSProber = true; - enableCryptodisk = true; - }; - }; + kernelModules = [ "kvm-intel" ]; + extraModulePackages = [ ]; initrd = { + availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + kernelModules = [ ]; systemd.enable = true; secrets = { "/boot/crypto_keyfile.bin" = null; }; luks = { + devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96"; #devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".keyFile = "/boot/crypto_keyfile.bin"; # device = "/dev/disk/by-uuid/DISK_UUID"; # keyfile = "/crypto_keyfile.bin"; - }; + }; + }; + + loader = { + + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; }; + + #systemd-boot = { + #enable = false; + #configurationLimit = 10; + #}; + + grub = { + enable = true; + efiSupport = true; + #efiInstallAsRemovable = true; + device = "/dev/sda"; + useOSProber = true; + enableCryptodisk = true; + }; + }; + }; + } diff --git a/hosts/hades/configuration.nix b/hosts/hades/configuration.nix index b84f422..59aad37 100644 --- a/hosts/hades/configuration.nix +++ b/hosts/hades/configuration.nix @@ -11,29 +11,8 @@ ]; - services.fstrim.enable = true; - # powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - - hardware = { - - cpu.intel.updateMicrocode = true; - enableAllFirmware = true; - bluetooth.enable = false; - - opengl = { - enable = true; - extraPackages = with pkgs; [ - intel-compute-runtime - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; - }; - - }; - + nix = { # settings = { # }; @@ -45,12 +24,4 @@ }; }; - environment.systemPackages = with pkgs; [ - umr - radeontop - radeontools - radeon-profile - amdgpu_top - ]; - } diff --git a/hosts/hades/hardware-configuration.nix b/hosts/hades/hardware-configuration.nix index dc20613..1897f26 100644 --- a/hosts/hades/hardware-configuration.nix +++ b/hosts/hades/hardware-configuration.nix @@ -9,10 +9,10 @@ ./boot-config.nix ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + #boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + #boot.initrd.kernelModules = [ ]; + #boot.kernelModules = [ "kvm-intel" ]; + #boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; @@ -20,10 +20,42 @@ options = [ "subvol=@" ]; }; - boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96"; + #fileSystems."/boot" = + #{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; + #fsType = "btrfs"; + #options = [ "subvol=@" ]; + #}; + + #boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96"; swapDevices = [ ]; + services.fstrim.enable = true; + + hardware = { + cpu.intel.updateMicrocode = true; + enableAllFirmware = true; + bluetooth.enable = false; + opengl = { + enable = true; + extraPackages = with pkgs; [ + intel-compute-runtime + intel-media-driver + vaapiIntel + vaapiVdpau + libvdpau-va-gl + ]; + }; + }; + + environment.systemPackages = with pkgs; [ + umr + radeontop + amdgpu_top + radeontools + radeon-profile + ]; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction