cwel

5 files changed, 30 insertions, 46 deletions

diff --git a/flake.lock b/flake.lock
index 58d69fe..e87160e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -136,11 +136,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772845525,
-        "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
+        "lastModified": 1772985285,
+        "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
+        "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772842024,
-        "narHash": "sha256-rP+FjAOPqvAJO+hhVSEP3lxkrP6txFgM5O9QOo9Xekc=",
+        "lastModified": 1772928300,
+        "narHash": "sha256-7WXA2vUlHNvCjjTDLsM0CGzTE52d8M8tXj+c4QOQnsk=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "fb3e5603c475739c421d3e941c608bc20986ef18",
+        "rev": "8df2141922896b7923ab78d624951f29531b5e8a",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1772822087,
-        "narHash": "sha256-uaecQjyj20yqMHcNNAnJzTsgi3rjDfx2mh9bD9TNPks=",
+        "lastModified": 1772909350,
+        "narHash": "sha256-SOywFX51TumgEMzjRN8JBo2E59Dr9+13sye7qv20nR8=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "34a59e30dbe23bab59bc6b39a4b235c5b2862e60",
+        "rev": "e8e694d837427bd158d51dd62a25f165d49725c6",
         "type": "github"
       },
       "original": {
@@ -286,11 +286,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1771969195,
-        "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
+        "lastModified": 1772972630,
+        "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
+        "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
         "type": "github"
       },
       "original": {
@@ -470,11 +470,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772495394,
-        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
+        "lastModified": 1772944399,
+        "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
+        "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0",
         "type": "github"
       },
       "original": {
@@ -491,11 +491,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1772494187,
-        "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=",
+        "lastModified": 1773007504,
+        "narHash": "sha256-4NtiCDH3RunKbrlWvPCB6dyTjCwqdrHaBDeMCzG6gIA=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "915ab06b046d05613041780c575c62a32fe67cea",
+        "rev": "434e63b851f9139aaeddc3b8de44d47992828b3b",
         "type": "github"
       },
       "original": {
@@ -557,11 +557,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772901987,
-        "narHash": "sha256-FdfUDo6FNozvXoeGGDutp9A++0sjG0xNhz//o+A9j5w=",
+        "lastModified": 1773004900,
+        "narHash": "sha256-LuDrFLdszUdnSlDdwQjRwLQiQZUPkiBuI+Y2UlRmjfg=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "e425423648ea620627a0ba0c9c81173af18c0254",
+        "rev": "100349a5c7f45a032712c1ec85696164d44e5430",
         "type": "github"
       },
       "original": {
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index f9d3f6c..5dd5b8f 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -14,7 +14,7 @@
     ../../os/default.nix
   ];
 
-  hardware.facter.reportPath = /etc/nixos/hosts/thinkpad/facter.json;
+  hardware.facter.reportPath = ./facter.json;
 
   os = {
     core = {
@@ -84,16 +84,6 @@
   };
   boot = {
     kernelParams = [ "iomem=relaxed" ];
-    initrd = {
-      secrets = {
-        "/etc/cryptsetup-keys.d/root.key" = "/etc/cryptsetup-keys.d/root.key";
-      };
-      luks.devices."crypted" = {
-        device = "/dev/nvme0n1p2";
-        keyFile = "/etc/cryptsetup-keys.d/root.key";
-        allowDiscards = true;
-      };
-    };
   };
   services.thinkfan.enable = true;
 }
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index 3ab76f4..0f366e9 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -11,6 +11,14 @@
               size = "1M";
               type = "EF02";
             };
+            boot = {
+              size = "2G";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/boot";
+              };
+            };
             luks = {
               size = "100%";
               content = {
@@ -33,16 +41,6 @@
                         "noatime"
                       ];
                     };
-                    "boot" = {
-                      mountpoint = "/boot";
-                      mountOptions = [
-                        "compress=none"
-                        "discard=async"
-                        "nosuid"
-                        "nodev"
-                        "noatime"
-                      ];
-                    };
                     "nix" = {
                       mountpoint = "/nix";
                       mountOptions = [
diff --git a/os/core/bootloader.nix b/os/core/bootloader.nix
index 6eca320..95d0cf1 100644
--- a/os/core/bootloader.nix
+++ b/os/core/bootloader.nix
@@ -1,12 +1,10 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 let
   cfg = config.os.core.bootloader;
-  gpgHome = "/root/.gnupg";
 in
 {
   options.os.core.bootloader = {
@@ -91,7 +89,6 @@ in
     (lib.mkIf (cfg.type == "grub") {
       boot.loader.grub = {
         enable = true;
-        device = cfg.grub.device;
         efiSupport = cfg.efi;
         useOSProber = cfg.grub.useOSProber;
         default = cfg.grub.defaultEntry;
diff --git a/os/core/power.nix b/os/core/power.nix
index b74c077..b3dbf91 100644
--- a/os/core/power.nix
+++ b/os/core/power.nix
@@ -22,7 +22,6 @@ in
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
       {
-        programs.light.enable = true;
         powerManagement.powertop.enable = true;
         boot.kernelParams = [ "nvme_core.default_ps_max_latency_us=0" ];
       }