switch to latest kernel

3 files changed, 49 insertions, 28 deletions

diff --git a/nixos/boot.nix b/nixos/boot.nix
index 8cd3afa..b91bde6 100644
--- a/nixos/boot.nix
+++ b/nixos/boot.nix
@@ -1,8 +1,11 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
+
+    <nixos-hardware/dell/latitude/7490>
+    <nixos-hardware/common/pc/ssd>
   ];
 
   boot.loader = {
@@ -34,4 +37,13 @@
       preLVM = true;
     };
   };
+
+  # Kernel
+  boot.initrd.availableKernelModules =
+    [ "usb_storage" ];
+  boot.kernelParams =
+    [ "i915.dc_enable=0" "intel_idle.max_cstate=1" ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  hardware.firmware = with pkgs; [ firmwareLinuxNonfree ];
 }
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index f4422ab..4dbe249 100644
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -55,6 +55,8 @@ in {
     autoRepeatDelay = 200;
   };
 
+  programs.steam.enable = true;
+
   # Allow all users to change hardware settings (brightness, backlight)
   services.udev.extraRules = ''
     ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="intel_backlight", MODE="0666", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/backlight/%k/brightness"
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
index 6166d92..b7f076e 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -1,40 +1,47 @@
-{ lib, pkgs, modulesPath, ... }:
+# 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, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-    <nixos-hardware/dell/latitude/7490>
-    <nixos-hardware/common/pc/ssd>
-  ];
-
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
-  boot.kernelParams =
-    [ "i915.dc_enable=0" "intel_idle.max_cstate=1" ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/f5809224-8478-474f-b25d-dde1ada37957";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f5809224-8478-474f-b25d-dde1ada37957";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/330B-45DE";
-    fsType = "vfat";
-  };
+  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."/home" =
+    { device = "/dev/disk/by-uuid/8a6efcde-2361-40d5-a341-62188c014618";
+      fsType = "ext4";
+    };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/0cf1b50c-670c-4dc6-bb91-fc45d6148028"; }];
-
-  hardware.firmware = with pkgs; [ firmwareLinuxNonfree ];
+    [ { device = "/dev/disk/by-uuid/0cf1b50c-670c-4dc6-bb91-fc45d6148028"; }
+    ];
+
+  # 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.<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";
-  programs.steam.enable = true;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }