various cleanups

flake.lock

@@ -1062,6 +1062,24 @@
       }
     },
     "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
       "inputs": {
         "systems": [
           "sdm845",
@@ -2707,6 +2725,28 @@
         "type": "github"
       }
     },
+    "polkit-stdin-agent": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "run0-sudo-shim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779895539,
+        "narHash": "sha256-Nl/+IBbUEsxSKSWLXwUB3mV4iAG0z9mv+Bl6CSeFzR4=",
+        "ref": "refs/heads/main",
+        "rev": "95beb16b78de357ac11de2b492597c1add2503b7",
+        "revCount": 16,
+        "type": "git",
+        "url": "https://git.grimmauld.de/mirrors/polkit-stdin-agent"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.grimmauld.de/mirrors/polkit-stdin-agent"
+      }
+    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -2801,18 +2841,20 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "polkit-stdin-agent": "polkit-stdin-agent",
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1779902501,
-        "narHash": "sha256-llpSeqQmNtFu+FHXNlt7FvZxIHX9a9Et4PDzZPpVajs=",
+        "lastModified": 1779918587,
+        "narHash": "sha256-2bSbW9ePJgbVyik6yISZuClY3hB9f8qJ2MDqBHCy3XM=",
         "owner": "lordgrimmauld",
         "repo": "run0-sudo-shim",
-        "rev": "b1d20e5d05a0c303cbd9ce05ecbb2870d1ccff6f",
+        "rev": "1cc886225f4c08ce4b0da6224fcb540a8bc53246",
         "type": "github"
       },
       "original": {
         "owner": "lordgrimmauld",
+        "ref": "stdin-agent",
         "repo": "run0-sudo-shim",
         "type": "github"
       }
@@ -2914,7 +2956,7 @@
         "flake-compat": "flake-compat_5",
         "flake-parts": "flake-parts_9",
         "flake-schemas": "flake-schemas",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "flake-utils-plus": "flake-utils-plus",
         "flat-flake": "flat-flake",
         "git-hooks-nix": "git-hooks-nix",
@@ -2961,7 +3003,7 @@
         "preservation": "preservation",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
-        "systems": "systems_4",
+        "systems": "systems_5",
         "treefmt-nix": "treefmt-nix_4",
         "weird-deployer": "weird-deployer"
       },
@@ -3013,7 +3055,7 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_5",
+        "systems": "systems_6",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
@@ -3108,6 +3150,21 @@
         "type": "github"
       }
     },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-kitty": {
       "flake": false,
       "locked": {

flake.nix

@@ -15,7 +15,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     run0-sudo-shim = {
-      url = "github:lordgrimmauld/run0-sudo-shim";
+      url = "github:lordgrimmauld/run0-sudo-shim/stdin-agent";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sable = {
@@ -123,21 +123,11 @@
             [
               ./wrappers/default.nix
               { networking.hostName = info.hostname; }
-              inputs.agenix.nixosModules.default
-              inputs.run0-sudo-shim.nixosModules.default
             ]
             ++ dirFiles ".nix" ./modules/common
             ++ dirFiles ".nix" ./modules/${info.type}
             ++ opt (builtins.pathExists clientPath) (dirFiles ".nix" clientPath)
-            ++ opt info.graphical (
-              (dirFiles ".nix" ./modules/graphical)
-              ++ [
-                inputs.home-manager.nixosModules.home-manager
-                inputs.nix-maid.nixosModules.default
-                inputs.stylix.nixosModules.stylix
-                ./stylix.nix
-              ]
-            );
+            ++ opt info.graphical (dirFiles ".nix" ./modules/graphical);
         };
     in
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {

modules/common/agenix.nix

@@ -1,9 +1,11 @@
 {
   dirUtils,
+  inputs,
   lib,
   ...
 }:
 {
+  imports = [ inputs.agenix.nixosModules.default ];
   age = {
     identityPaths = [
       "/home/quadradical/.ssh/id_ed25519"

modules/graphical/maid.nix

@@ -0,0 +1,4 @@
+{ inputs, ... }:
+{
+  imports = [ inputs.nix-maid.nixosModules.default ];
+}

modules/graphical/run0.nix

@@ -1,4 +1,5 @@
+{ inputs, ... }:
 {
-  # TODO: Server too
-  # security.run0-sudo-shim.enable = true;
+  imports = [ inputs.run0-sudo-shim.nixosModules.default ];
+  security.run0-sudo-shim.enable = true;
 }

modules/graphical/stylix.nix

@@ -1,5 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
+  imports = [
+    inputs.stylix.nixosModules.stylix
+    inputs.home-manager.nixosModules.home-manager
+  ];
   stylix = {
     enable = true;
     polarity = "dark";