flake

commit cc539778e5a1535b5ea0cafbbfbff89d019d2daa
parent 07d2961f633d30c63c504bd5a80ebd83c310d8a5
Author: Francesco Saccone <francesco@francescosaccone.com>
Date:   Thu, 15 May 2025 09:19:59 +0200

fix: update 'modules' attribute set to new attrs in git-server

Signed-off-by: Francesco Saccone <francesco@francescosaccone.com>

Diffstat:
M
hosts/git-server/default.nix
 | 
31
++++++++++++++++---------------
M
hosts/git-server/scripts.nix
 | 
2
+-

2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/hosts/git-server/default.nix b/hosts/git-server/default.nix
@@ -13,8 +13,8 @@ let
   scripts = import ./scripts.nix { inherit config pkgs inputs; };
 
   stagit = {
-    destDir = config.modules.quark.directory;
-    reposDir = config.modules.git.directory;
+    destDir = config.services.quark.directory;
+    reposDir = config.services.git.directory;
   };
 in
 {
@@ -22,7 +22,7 @@ in
     ./disk-config.nix
   ];
 
-  modules = {
+  services = {
     bind = {
       enable = true;
       domain = rootDomain;
@@ -51,8 +51,8 @@ in
 
             copyRepositories = pkgs.writeShellScript "copy-repositories" ''
               ${pkgs.sbase}/bin/cp -R \
-                ${config.modules.git.directory}/* \
-                ${config.modules.quark.directory}
+                ${config.services.git.directory}/* \
+                ${config.services.quark.directory}
             '';
           in
           [
@@ -69,7 +69,7 @@ in
         enable = true;
         pemFiles =
           let
-            inherit (config.modules.quark.acme) directory;
+            inherit (config.services.quark.acme) directory;
           in
           [
             "${directory}/${gitDomain}/fullchain.pem"
@@ -119,15 +119,16 @@ in
         enable = true;
       };
     };
-    openssh.listen = {
-      enable = true;
-      port = 22;
-      authorizedKeyFiles = rec {
-        root = [
-          "${mainServer}/ssh/francescosaccone.pub"
-        ];
-        git = root;
-      };
+  };
+
+  security.openssh.listen = {
+    enable = true;
+    port = 22;
+    authorizedKeyFiles = rec {
+      root = [
+        "${mainServer}/ssh/francescosaccone.pub"
+      ];
+      git = root;
     };
   };
 
diff --git a/hosts/git-server/scripts.nix b/hosts/git-server/scripts.nix
@@ -79,7 +79,7 @@ in
         inherit destDir reposDir;
       };
       createRepositories =
-        config.modules.git.repositories
+        config.services.git.repositories
         |> builtins.attrNames
         |> builtins.map (
           name: