diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index 6f38bf7..156547e 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -110,6 +110,7 @@ in boot = { binfmt.emulatedSystems = [ "aarch64-linux" "riscv64-linux" ]; initrd.systemd.enable = true; + initrd.luks.devices."luks-4d7bf115-cdfd-486b-a2fd-ee620d81060c".device = "/dev/disk/by-uuid/4d7bf115-cdfd-486b-a2fd-ee620d81060c"; loader = { systemd-boot = { enable = true; @@ -117,7 +118,6 @@ in }; efi = { canTouchEfiVariables = true; - efiSysMountPoint = "/boot/efi"; }; }; kernelParams = [ diff --git a/hosts/europa/hardware-configuration.nix b/hosts/europa/hardware-configuration.nix index 2cfa95c..21fd038 100644 --- a/hosts/europa/hardware-configuration.nix +++ b/hosts/europa/hardware-configuration.nix @@ -1,44 +1,55 @@ -{ lib -, modulesPath -, ... -}: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot = { - initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ]; - kernelModules = [ ]; - }; - kernelModules = [ "kvm-amd" ]; - extraModulePackages = [ ]; - }; +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/4b758b9b-4c75-4658-9649-64a2ceba2a0b"; +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/0b946ca0-f0cb-4e54-bc73-d2afe6b328d2"; fsType = "ext4"; }; - "/run/media/qbit/backup" = { + + boot.initrd.luks.devices."luks-e8368ac8-9b9c-496f-bb19-0d1911070140".device = "/dev/disk/by-uuid/e8368ac8-9b9c-496f-bb19-0d1911070140"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3D38-3AEC"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/run/media/qbit/backup" = { device = "/dev/disk/by-uuid/6e71eeea-6437-46f4-88d0-126c92af42ef"; fsType = "ext4"; label = "backup"; neededForBoot = false; }; - }; - boot.initrd.luks.devices."luks-1f16b568-7726-44b6-b082-6b9d5e4d1972".device = "/dev/disk/by-uuid/1f16b568-7726-44b6-b082-6b9d5e4d1972"; - boot.initrd.luks.devices."luks-1f16b568-7726-44b6-b082-6b9d5e4d1972".crypttabExtraOpts = [ "fido2-device=auto" ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/1c2bb5e0-7ca8-4943-8e0f-527497ce2d61"; } + ]; - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/F0A2-4A56"; - fsType = "vfat"; - }; - - swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; + # 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 + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware = { bluetooth.enable = true; rtl-sdr.enable = true; }; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }