coredns added

flake.lock

@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781189114,
+        "lastModified": 1781365335,
-        "narHash": "sha256-5inaamLgUMWy+MOBE9ChF9QAF1o/74LFuHkI0W/9rqc=",
+        "narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "486595d2cf49cfcd649b58a284fa11ac0e34da22",
+        "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1781298072,
+        "lastModified": 1781461743,
-        "narHash": "sha256-p7sszdPeM3Gm7LA+NrWlxn5Rp6Qp+TGbt2qC/XBCxgI=",
+        "narHash": "sha256-gjBRAyMLpEJ+xtfHNLNE+5iFiSREBMmEYp8hFtL0Afs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "633f0c001a27731ee16cc504e831a4a9ccf071d6",
+        "rev": "94af5fb07bc318fb359ad100ab64457ccbbaf38a",
         "type": "github"
       },
       "original": {

modules/server/coredns.nix

@@ -0,0 +1,25 @@
+{
+  config,
+  pkgs,
+  ...
+}:
+{
+  services.coredns = {
+    enable = true;
+    config = ''
+      zeroq.su:53 {
+          hosts {
+              192.168.1.20 dns.zeroq.su
+              192.168.1.20 immich.zeroq.su
+              fallthrough
+          }
+          cache 300
+          log
+      }
+      .:53 {
+          forward . 1.1.1.1 9.9.9.9
+          cache 300
+      }
+    '';
+  };
+}

modules/server/default.nix

@@ -7,6 +7,7 @@
     ../software/beets
     ./bentopdf.nix
     ./calibre-web.nix
+    ./coredns.nix
     ./gitea.nix
     ./glances.nix
     ./immich.nix

modules/server/n8n.nix

@@ -6,11 +6,19 @@
   inputs,
   ...
 }:
+let
+  configDir = "${xlib.dirs.services-mnt-folder}/n8n";
+  varDir = "/var/lib/n8n";
+  master = import inputs.nixpkgs-beets {
+    system = "x86_64-linux";
+  };
+in
 {
   services.n8n = {
-    enable = false;
+    enable = true;
+    package = master.n8n;
     environment = {
-      # N8N_USER_FOLDER = lib.mkForce "${xlib.dirs.services-mnt-folder}/n8n";
+      # N8N_USER_FOLDER = lib.mkForce "${configDir}";
       N8N_SECURE_COOKIE = "false";
       N8N_PORT = 5678;
     };
@@ -18,12 +26,12 @@
   };
 
   systemd.tmpfiles.rules = [
-    "d ${xlib.dirs.services-mnt-folder}/n8n 0755 nobody nogroup -"
+    "d ${configDir} 0755 nobody nogroup -"
-    "z ${xlib.dirs.services-mnt-folder}/n8n 0755 nobody nogroup -"
+    "z ${configDir} 0755 nobody nogroup -"
   ];
 
-  fileSystems."/var/lib/n8n" = {
+  fileSystems.${varDir} = {
-    device = "${xlib.dirs.services-mnt-folder}/n8n";
+    device = "${configDir}";
     fsType = "none";
     options = [
       "bind"

modules/server/nginx.nix

@@ -34,22 +34,6 @@ in
         "office.local" = {
           forceSSL = false;
           enableACME = false;
-          # locations = {
-          #   "/" = {
-          #     proxyPass = "http://localhost:8090";
-          #     proxyWebsockets = true;
-          #   };
-          # };
-          # extraConfig = ''
-          #   proxy_set_header Host $host;
-          #   proxy_set_header X-Forwarded-Proto $scheme;
-          #   proxy_set_header X-Forwarded-Host $host;
-          #   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-          #   proxy_http_version 1.1;
-          #   proxy_set_header Upgrade $http_upgrade;
-          #   proxy_set_header Connection "upgrade";
-          # '';
         };
         "bentopdf.local" = {
           forceSSL = false;
@@ -154,22 +138,6 @@ in
             client_max_body_size 5G;
           '';
         };
-        #         "office.local" = {
-        #           enableACME = false;
-        #           forceSSL = false;
-        #           locations = {
-        #             "/" = {
-        #               proxyPass = "http://${server}:8000"; # 9980
-        #               proxyWebsockets = true;
-        #             };
-        #           };
-        #           extraConfig = ''
-        #             client_max_body_size 5G;
-        #             proxy_set_header X-Forwarded-Proto $scheme;
-        #             proxy_set_header X-Real-IP $remote_addr;
-        #             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        #           ''; # absolute_redirect off;
-        #         };
         "calibre.local" = {
           forceSSL = false;
           enableACME = false;