zaphyra's git: nixfiles

npins: remove `haumea`

diff --git a/nixosModules/zpha/programs/shaderbg.nix b/nixosModules/zpha/programs/shaderbg.nix
@@ -27,7 +27,7 @@
           ExecStart = lib.escapeShellArgs [
             (lib.getExe pkgs.zpha.shaderbg)
             "*"
-            resources.shaders.background1
+            resources.shaders."background1.frag"
           ];
         };
       };

diff --git a/nixosModules/zpha/programs/swaylock.nix b/nixosModules/zpha/programs/swaylock.nix
@@ -36,7 +36,7 @@ in
       show-failed-attempts = true;
       fingerprint = false;
 
-      command = "${lib.getExe pkgs.zpha.shaderbg} '*' --fps 10 ${resources.shaders.background1}";
+      command = "${lib.getExe pkgs.zpha.shaderbg} '*' --fps 10 ${resources.shaders."background1.frag"}";
 
       # image = "/home/zaphyra/Pictures/Backgrounds/lock.png";
       # scaling = "fit";

diff --git a/nixosModules/zpha/websites/hass.zaphyra.eu.nix b/nixosModules/zpha/websites/hass.zaphyra.eu.nix
@@ -65,7 +65,7 @@
           kTLS = true;
           root = pkgs.zpha.mqtt-webui.override {
             patches = [
-              resources.patches.mqttwebui-florapatches-owo
+              resources.patches."mqttwebui-florapatches-owo.patch"
             ];
           };
           locations = {

diff --git a/npins/sources.json b/npins/sources.json
@@ -69,18 +69,6 @@
       "url": null,
       "hash": "sha256-twTkdTPSVNcpquvQgx3LkXd7lwBP4/sW2W98oO9/C+g="
     },
-    "haumea": {
-      "type": "Git",
-      "repository": {
-        "type": "Git",
-        "url": "https://git.zaphyra.eu/haumea"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "d8d558fc6dadc561381e06b0411b5a57a08927df",
-      "url": null,
-      "hash": "sha256-cKGfYcBhYShBioa1yjE5OPQtwKpCjEAOhtowhUzsrgk="
-    },
     "lanzaboote": {
       "type": "GitRelease",
       "repository": {

diff --git a/resources/default.nix b/resources/default.nix
@@ -1,21 +1,16 @@
 {
-  npins ? import ../npins,
   lib ? import "${(import ../npins).nixpkgs}/lib",
   ...
 }:
 
 let
-  haumea = import npins.haumea { inherit lib; };
+  readDir =
+    dir:
+    lib.filterAttrs (name: _: name != "default.nix") (
+      lib.mapAttrs (
+        name: value: if value == "directory" then (readDir (dir + "/${name}")) else dir + "/${name}"
+      ) (builtins.readDir dir)
+    );
 
 in
-(haumea.load {
-  src = ./.;
-  transformer =
-    name: value:
-    (
-      if name == [ ] then value else (if (builtins.hasAttr "default" value) then value.default else value)
-    );
-  loader = [
-    (haumea.matchers.always haumea.loaders.path)
-  ];
-})
+readDir ./.

diff --git a/secrets/default.nix b/secrets/default.nix
@@ -1,21 +1,19 @@
 {
-  npins ? import ../npins,
   lib ? import "${(import ../npins).nixpkgs}/lib",
   ...
 }:
 
 let
-  haumea = import npins.haumea { inherit lib; };
+  readDir =
+    dir:
+    lib.filterAttrs (name: _: name != "default.nix") (
+      lib.mapAttrs' (
+        name: value:
+        lib.nameValuePair (lib.removeSuffix ".yaml" name) (
+          if value == "directory" then (readDir (dir + "/${name}")) else dir + "/${name}"
+        )
+      ) (builtins.readDir dir)
+    );
 
 in
-(haumea.load {
-  src = ./.;
-  transformer =
-    name: value:
-    (
-      if name == [ ] then value else (if (builtins.hasAttr "default" value) then value.default else value)
-    );
-  loader = [
-    (haumea.matchers.always haumea.loaders.path)
-  ];
-})
+readDir ./.