nix

commit fc28fb2da18ebefae704c686a9414ad46e00b686
parent 8c442e158179f9e63f86f218bf27b7fb8ac481d2
Author: mtmn <miro@haravara.org>
Date:   Sun, 19 Apr 2026 18:08:29 +0200

chore: cleanup

Diffstat:
M
flake.nix
 | 
52
+++++++++-------------------------------------------
M
hosts/wsl/overlays/config/magdalena/config.json.nix
 | 
7
+------

2 files changed, 10 insertions(+), 49 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -100,21 +100,7 @@
             pkgs = nixpkgs.legacyPackages.${host.system};
             extraSpecialArgs = specialArgs // {inherit username homeDirectory;};
             modules =
-              [
-                {
-                  nix.settings = {
-                    substituters = [
-                      "https://cache.nixos.org"
-                      "https://nix-community.cachix.org"
-                    ];
-                    trusted-public-keys = [
-                      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-                      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-                    ];
-                  };
-                }
-                ./home.nix
-              ]
+              [./home.nix]
               ++ (config.pkgSets or []);
           }
         ))
@@ -149,34 +135,14 @@
   in {
     inherit nixosConfigurations homeConfigurations configData;
 
-    nixosModules = let
-      importService = name: import ./modules/services/${name}.nix;
-    in
-      lib.genAttrs [
-        "cinny"
-        "monitoring"
-        "caddy"
-        "forgejo"
-        "matrix"
-        "dex"
-        "seaweedfs"
-        "filestash"
-        "heisenbridge"
-        "couchdb"
-        "oauth2-proxy"
-        "storage-box"
-        "shirt-linkener"
-        "bandeno"
-        "headscale"
-        "searxng"
-        "static"
-        "miniflux"
-        "corpus"
-        "napkins"
-        "listenbrainz-mpd"
-        "redlib"
-      ]
-      importService
+    nixosModules =
+      lib.mapAttrs' (
+        filename: _:
+          lib.nameValuePair
+          (lib.removeSuffix ".nix" filename)
+          (import ./modules/services/${filename})
+      ) (lib.filterAttrs (n: t: t == "regular" && lib.hasSuffix ".nix" n)
+        (builtins.readDir ./modules/services))
       // {
         base = import ./modules/nixos/base.nix;
       };
diff --git a/hosts/wsl/overlays/config/magdalena/config.json.nix b/hosts/wsl/overlays/config/magdalena/config.json.nix
@@ -1,9 +1,4 @@
-{
-  homeDir,
-  year,
-  month,
-  ...
-}: ''
+{homeDir, ...}: ''
   {
   	"editor": "nvim",
   	"max_depth": 5,