flake

commit 38d6a431712247e7edc8202a0072488595adf607
parent d51c448c3e476cd1d201578db38ee81b1c73c6b1
Author: Francesco Saccone <francesco@francescosaccone.com>
Date:   Thu, 15 May 2025 09:26:55 +0200

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

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

Diffstat:
M
hosts/main-server/default.nix
 | 
29
+++++++++++++++--------------

1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/hosts/main-server/default.nix b/hosts/main-server/default.nix
@@ -12,7 +12,7 @@ rec {
     ./disk-config.nix
   ];
 
-  modules = {
+  services = {
     agate = {
       enable = true;
       preStart = {
@@ -68,25 +68,25 @@ rec {
           let
             generateAtom = builtins.concatStringsSep " " [
               "${inputs.site}/scripts/generate-atom.sh"
-              config.modules.quark.directory
+              config.services.quark.directory
               "\"Francesco Saccone's blog\""
               "https://${domain}"
             ];
             generateSitemap = builtins.concatStringsSep " " [
               "${inputs.site}/scripts/generate-sitemap.sh"
-              config.modules.quark.directory
+              config.services.quark.directory
               "https://${domain}"
             ];
             generateHtml = builtins.concatStringsSep " " [
               "${inputs.site}/scripts/generate-html.sh"
-              config.modules.quark.directory
+              config.services.quark.directory
             ];
             copyStaticContent = pkgs.writeShellScript "copy-static-content" ''
               ${pkgs.sbase}/bin/cp -r \
                 ${inputs.site}/public \
                 ${inputs.site}/favicon.ico \
                 ${inputs.site}/robots.txt \
-                ${config.modules.quark.directory}
+                ${config.services.quark.directory}
             '';
           in
           [
@@ -112,7 +112,7 @@ rec {
         enable = true;
         pemFiles =
           let
-            inherit (config.modules.quark.acme) directory;
+            inherit (config.services.quark.acme) directory;
           in
           [
             "${directory}/${domain}/fullchain.pem"
@@ -120,14 +120,15 @@ rec {
           ];
       };
     };
-    openssh.listen = {
-      enable = true;
-      port = 22;
-      authorizedKeyFiles = rec {
-        root = [
-          ./ssh/francescosaccone.pub
-        ];
-      };
+  };
+
+  security.openssh.listen = {
+    enable = true;
+    port = 22;
+    authorizedKeyFiles = rec {
+      root = [
+        ./ssh/francescosaccone.pub
+      ];
     };
   };