diff options
Diffstat (limited to 'nixos/hardware')
| -rw-r--r-- | nixos/hardware/default.nix | 9 | ||||
| -rw-r--r-- | nixos/hardware/hardware-configuration.nix | 36 |
2 files changed, 20 insertions, 25 deletions
diff --git a/nixos/hardware/default.nix b/nixos/hardware/default.nix index 0e8dc15..9c0fa3a 100644 --- a/nixos/hardware/default.nix +++ b/nixos/hardware/default.nix @@ -5,13 +5,14 @@ ./hardware-configuration.nix # Community-curated hardware configuration - nixos-hardware.nixosModules.dell-latitude-7490 + nixos-hardware.nixosModules.common-cpu-intel + nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-ssd ]; personal.hardware = { usb.enable = true; - disks.crypted = "/dev/disk/by-uuid/ba5dc9cd-3a73-4a01-880b-8720844307ae"; + disks.crypted = "/dev/disk/by-uuid/10aefeb6-e479-43cb-9848-53bd788a77ee"; firmwareNonFree.enable = true; keyboard.keyMap = "fr"; backlights = { @@ -21,6 +22,6 @@ sound.enable = true; }; - # faulty Intel CPU - boot.kernelParams = [ "i915.dc_enable=0" "intel_idle.max_cstate=1" ]; + # https://wiki.archlinux.org/title/Dell_Latitude_7280 + boot.kernelParams = [ "intel_idle.max_cstate=4" ]; } diff --git a/nixos/hardware/hardware-configuration.nix b/nixos/hardware/hardware-configuration.nix index 77f7942..e264459 100644 --- a/nixos/hardware/hardware-configuration.nix +++ b/nixos/hardware/hardware-configuration.nix @@ -4,31 +4,28 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/f5809224-8478-474f-b25d-dde1ada37957"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/c08fcfed-a250-4cda-b1d7-9483ea7b3136"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/330B-45DE"; - fsType = "vfat"; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/8a6efcde-2361-40d5-a341-62188c014618"; - fsType = "ext4"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5C58-7F16"; + fsType = "vfat"; + }; swapDevices = - [{ device = "/dev/disk/by-uuid/0cf1b50c-670c-4dc6-bb91-fc45d6148028"; }]; + [ { device = "/dev/disk/by-uuid/cc2b2f1e-1c41-4b3e-9432-81f75d40a892"; } + ]; # 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 @@ -36,11 +33,8 @@ # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.tun0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } |
