nix

commit 814bc3b279ffc736c55aed8c22c636ab6611a473
parent 5fadaa6057451ef03f8294de9576fb6872cc1582
Author: mtmn <miro@haravara.org>
Date:   Mon, 13 Apr 2026 00:35:51 +0200

chore: rewrite modules func

Diffstat:
M
flake.nix
 | 
66
++++++++++++++++++++++++++++++++++++++----------------------------
M
hosts/nixaran/configuration.nix
 | 
0

2 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs = {
+      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -32,7 +34,9 @@
       flake = false;
     };
 
-    scorpus.url = "git+ssh://git@codeberg.org/mtmn/scorpus.git";
+    scorpus = {
+      url = "git+ssh://git@codeberg.org/mtmn/scorpus.git";
+    };
   };
 
   outputs = {
@@ -145,32 +149,38 @@
   in {
     inherit nixosConfigurations homeConfigurations configData;
 
-    nixosModules = {
-      base = import ./modules/nixos/base.nix;
-      cinny = import ./modules/services/cinny.nix;
-      monitoring = import ./modules/services/monitoring.nix;
-      caddy = import ./modules/services/caddy.nix;
-      forgejo = import ./modules/services/forgejo.nix;
-      matrix = import ./modules/services/matrix.nix;
-      dex = import ./modules/services/dex.nix;
-      seaweedfs = import ./modules/services/seaweedfs.nix;
-      filestash = import ./modules/services/filestash.nix;
-      heisenbridge = import ./modules/services/heisenbridge.nix;
-      couchdb = import ./modules/services/couchdb.nix;
-      oauth2-proxy = import ./modules/services/oauth2-proxy.nix;
-      storage-box = import ./modules/services/storage-box.nix;
-      bazel-cache = import ./modules/services/bazel-cache.nix;
-      shirt-linkener = import ./modules/services/shirt-linkener.nix;
-      bandeno = import ./modules/services/bandeno.nix;
-      headscale = import ./modules/services/headscale.nix;
-      searxng = import ./modules/services/searxng.nix;
-      attic = import ./modules/services/attic.nix;
-      static = import ./modules/services/static.nix;
-      miniflux = import ./modules/services/miniflux.nix;
-      listenbrainz-mpd = import ./modules/services/listenbrainz-mpd.nix;
-      scorpus = import ./modules/services/scorpus.nix;
-      napkins = import ./modules/services/napkins.nix;
-    };
+    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"
+        "bazel-cache"
+        "shirt-linkener"
+        "bandeno"
+        "headscale"
+        "searxng"
+        "attic"
+        "static"
+        "miniflux"
+        "scorpus"
+        "napkins"
+        "listenbrainz-mpd"
+      ]
+      importService
+      // {
+        base = import ./modules/nixos/base.nix;
+      };
 
     deploy = {
       nodes = deployNodes;
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix
Binary files differ.