From ac9c372a87f84a378011450651645af0e08e71e3 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Sat, 6 May 2023 22:36:42 -0700
Subject: [PATCH] update flake lock & update laptop config

---
 devices/skynet/base.nix     | 23 +++++++++++++++++++++++
 devices/skynet/hardware.nix | 33 ---------------------------------
 flake.lock                  | 18 +++++++++---------
 flake.nix                   |  1 -
 4 files changed, 32 insertions(+), 43 deletions(-)
 delete mode 100644 devices/skynet/hardware.nix

diff --git a/devices/skynet/base.nix b/devices/skynet/base.nix
index 67cf8c7..4f98c05 100644
--- a/devices/skynet/base.nix
+++ b/devices/skynet/base.nix
@@ -23,4 +23,27 @@
   '';
 
   hardware.enableRedistributableFirmware = true;
+  hardware.cpu.intel.updateMicrocode = true;
+  hardware.sensor.iio.enable = true;
+
+  boot = {
+    initrd = {
+      availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
+    };
+    kernelModules = ["kvm-intel"];
+    kernelParams = ["i915.force_probe=46a6"];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/d0dfd8f7-355c-4d81-a20b-52b522914b96";
+      fsType = "xfs";
+    };
+    "/boot/efi" = {
+      device = "/dev/disk/by-uuid/FD80-0AEA";
+      fsType = "vfat";
+    };
+  };
+
+  nixpkgs.hostPlatform = "x86_64-linux";
 }
diff --git a/devices/skynet/hardware.nix b/devices/skynet/hardware.nix
deleted file mode 100644
index a13114c..0000000
--- a/devices/skynet/hardware.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
-
-  boot = {
-    initrd = {
-      availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
-      kernelModules = [];
-    };
-    kernelModules = ["kvm-intel"];
-    kernelParams = ["i915.force_probe=46a6"];
-    extraModulePackages = [];
-  };
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/d0dfd8f7-355c-4d81-a20b-52b522914b96";
-      fsType = "xfs";
-    };
-    "/boot/efi" = {
-      device = "/dev/disk/by-uuid/FD80-0AEA";
-      fsType = "vfat";
-    };
-  };
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/flake.lock b/flake.lock
index 187c90f..1d9d23a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -105,11 +105,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1683330367,
-        "narHash": "sha256-l4LVSjUPf/xEF+kcDZcMa4LZGe1/pJlZnyAP36VhZFI=",
+        "lastModified": 1683417608,
+        "narHash": "sha256-qdWRY50WhpjHKLKe7ngYdEnA+gYjOnE3PScQws0YofY=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "22205f36a6213f51f211a67444b335f916a2fa9f",
+        "rev": "fa1baa9a47cdb3eed17d48b6011a164d4009d2ee",
         "type": "github"
       },
       "original": {
@@ -209,11 +209,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1683267615,
-        "narHash": "sha256-A/zAy9YauwdPut90h6cYC1zgP/WmuW9zmJ+K/c5i6uc=",
+        "lastModified": 1683392273,
+        "narHash": "sha256-pZTuxvcuDeBG+vvE1zczNyEUzlPbzXVh8Ed45Fzo+tQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0b6445b611472740f02eae9015150c07c5373340",
+        "rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60",
         "type": "github"
       },
       "original": {
@@ -289,11 +289,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1683330335,
-        "narHash": "sha256-IunYfxuutivKideTDYoyK8pDQG8aNTv8wrpcIRx4z1g=",
+        "lastModified": 1683432572,
+        "narHash": "sha256-GPi990XR/OvHghGj2nZaxp/7m4LxTjlYuD77FsGjCrQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c8235601459998f5e703bff0125d33986d49d489",
+        "rev": "2305adfd63c885defb4d8c81e1e813d1a7e83331",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a42a2c2..5d3b8b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -104,7 +104,6 @@
           ++ [
             ./common/desktop/drivers/skynet.nix
             ./devices/skynet/base.nix
-            ./devices/skynet/hardware.nix
             nixos-hardware.nixosModules.framework-12th-gen-intel
             agenix.nixosModules.default
           ];