Use nixos-hardware modules

box/framework2.nix

@@ -11,8 +11,6 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = ["module_blacklist=hid_sensor_hub" "i915.enable_psr=0"];
   boot.extraModulePackages = [ ];
   
   networking.hostName = "framework2";
@@ -47,33 +45,11 @@
 
   services.fwupd.enable = true;
   hardware.bluetooth.enable = true;
-  services.fprintd.enable = true;
-  environment.systemPackages = with pkgs; [
-    terminus_font
-    pasystray
-  ];
-  console = {
-    earlySetup = true;
-    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
-    packages = with pkgs; [ terminus_font ];
-    keyMap = "us";
-  };
-  services.xserver.synaptics = {
-    enable = true;
-    twoFingerScroll = true;
-    accelFactor = "0.075";
-    fingersMap = [1 3 2 ];
-    palmDetect = true;
-    additionalOptions = ''
-      Option "MaxTapTime" "150"
-      Option "MaxTapMove" "25"
-
-    '';
-  };
   services.xserver.dpi = 180;
   environment.variables = {
     GDK_SCALE = "2";
     GDK_DPI_SCALE = "0.5";
     _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2";
   };
+  hardware.video.hidpi.enable = true;
 }

conf/awesome_workstation.nix

@@ -15,7 +15,6 @@
   programs.seahorse.enable = true;
   security.pam.services.kindrobot.enableGnomeKeyring = true;
   programs.gnupg.agent.pinentryFlavor = "qt";
-  programs.slock.enable = true;
   environment.systemPackages = with pkgs; [
     acpi
     arandr
@@ -24,23 +23,24 @@
     clipmenu
     dmenu
     emojipick
+    gcr
+    gnome.gnome-keyring
+    haskellPackages.greenclip
+    i3lock-fancy-rapid
     mpc-cli
     mpd
     networkmanagerapplet
     pasystray
     picom
     pinentry-qt
+    rofi
     scrot
     spectacle
     unclutter
     xclip
-    xsel
-    rofi
     xfce.ristretto
-    zathura
-    haskellPackages.greenclip
-    gnome.gnome-keyring
-    gcr
     xfce.xfce4-terminal
+    xsel
+    zathura
   ];
 }

flake.lock

@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1673737886,
-        "narHash": "sha256-hNTqD0uIgpbtTI2Nuj/Q1lEFOOdZqqXpxoc8rMno2F0=",
+        "lastModified": 1677783711,
+        "narHash": "sha256-eq5mOVk3gv5HITtLhPjKwi8bFnOaQplA3X0WFgHnmxE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2827b5306462d91edec16a3d069b2d6e54c3079f",
+        "rev": "b9e3a29864798d55ec1d6579ab97876bb1ee9664",
         "type": "github"
       },
       "original": {
@@ -21,13 +21,28 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1677591639,
+        "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1673631141,
-        "narHash": "sha256-AprpYQ5JvLS4wQG/ghm2UriZ9QZXvAwh1HlgA/6ZEVQ=",
+        "lastModified": 1677587185,
+        "narHash": "sha256-zYT66MAYwctAQqI5VBw3LbBXiSKdB8vuMAqCGG8onbE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "befc83905c965adfd33e5cae49acb0351f6e0404",
+        "rev": "68196a61c26748d3e53a6803de3d2f8c69f27831",
         "type": "github"
       },
       "original": {
@@ -40,6 +55,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
       }
     },

flake.nix

@@ -5,9 +5,10 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
   };
 
-  outputs = { self, nixpkgs, home-manager }: 
+  outputs = { self, nixpkgs, home-manager, nixos-hardware }: 
     {
       nixosConfigurations.silverado = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
@@ -57,6 +58,7 @@
             nixpkgs.config.allowUnfreePredicate = (pkg: true);
           })
           ./conf/awesome_workstation.nix
+          nixos-hardware.nixosModules.framework-12th-gen-intel
           ./box/framework2.nix
           home-manager.nixosModules.home-manager {
             home-manager.useGlobalPkgs = true;

home/kindrobot.nix

@@ -48,8 +48,13 @@
       pkgs.mu
     ];
   };
+  programs.fish = {
+    enable = true;
+    shellAliases = {
+      ec = "emacsclient";
+    };
+  };
   programs.command-not-found.enable = false;
-  programs.fish.enable = true;
   programs.nix-index.enable = true;
   programs.alacritty = {
     enable = true;