(Laptop) Gen 9: fixed up laptop config files to fit the environment better, added keyd

glasshouse-laptop/sys/default.nix

@@ -10,7 +10,8 @@
 	 ++ [ (import ./programs.nix) ]
 	 ++ [ (import ./services.nix) ]
 	 ++ [ (import ./system.nix) ]
-	 ++ [ (import ./users.nix) ];
+	 ++ [ (import ./users.nix) ]
+	 ++ [ (import ./keyd.nix) ];
 
 	environment.systemPackages = with pkgs; [
 		acpi

glasshouse-laptop/sys/hardware.nix

@@ -1,55 +1,39 @@
 # 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, modulesPath, username, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-	imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-	boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "uas" "sd_mod" ];
-	boot.initrd.kernelModules = [ ];
-	boot.kernelModules = [ "kvm-amd" ];
-	boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
-	fileSystems."/" =
-	{ device = "/dev/disk/by-uuid/a687e4e2-8665-43f1-9d62-3e3f21423579";
-		fsType = "ext4";
-	};
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/334f742b-460f-43f8-b819-33086adfa9fb";
+      fsType = "ext4";
+    };
 
-	fileSystems."/boot" =
-	{ device = "/dev/disk/by-uuid/6EAD-2C48";
-		fsType = "vfat";
-		options = [ "fmask=0022" "dmask=0022" ];
-	};
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/ECD9-F43B";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
-	fileSystems."/home" =
-	{ device = "/dev/nvme0n1p5";
-		fsType = "ext4";
-	};
+  swapDevices = [ ];
 
-	fileSystems."/home/${username}/steamlib" =
-	{ device = "/dev/nvme0n1p1";
-		fsType = "ext4";
-	};
+  # 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.enp0s25.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
-	swapDevices = [ ];
-
-# 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.enp14s0.useDHCP = lib.mkDefault true;
-# networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
-
-	nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-	hardware = { 
-		cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-		keyboard.uhk.enable = true;
-		amdgpu.amdvlk.enable = true;
-		bluetooth = {
-			enable = true;
-			powerOnBoot = true;
-		};
-	};
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

glasshouse-laptop/sys/keyd.nix

@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+{
+	services.keyd = {
+		enable = true;
+		keyboards = {
+			builtin = {
+				ids = [ "*" ];
+				settings = {
+					main = {
+						capslock = "esc";
+					};
+				};
+			};
+		};
+	};
+}

glasshouse-laptop/sys/system.nix

@@ -28,6 +28,7 @@
 		];
 	};
 
+	services.logrotate.checkConfig = false;
 	time.timeZone = "America/New_York";
 	i18n.defaultLocale = "en_US.UTF-8";
 }