systemd-mounts...

lix frozen-removed, rovr frozen-removed

configurations/server.nix

@@ -69,13 +69,10 @@ let
         };
         "${xlib.dirs.services-mnt-folder}" = {
           device = "${xlib.dirs.services-folder}";
+          fsType = "none";
           options = [
             "bind"
             "nofail"
-            # "uid=1000"
-            # "gid=1000"
-            # "fmask=0000"
-            # "dmask=0000"
           ];
         };
       };

modules/essentials/settings.nix

@@ -9,7 +9,7 @@
   system.nixos.label = "default";
 
   nix = {
-    package = pkgs.lixPackageSets.stable.lix;
+    # package = pkgs.lixPackageSets.stable.lix; # maybe unstable
     channel.enable = false;
     nixPath = [ "nixpkgs=flake:nixpkgs" ];
     settings = {

modules/server/calibre-web.nix

@@ -28,6 +28,7 @@ in
 
   fileSystems."/var/lib/calibre-web" = {
     device = "${xlib.dirs.services-mnt-folder}/calibre-web";
+    fsType = "none";
     options = [
       "bind"
       "nofail"

modules/server/immich.nix

@@ -25,14 +25,6 @@ in
     };
   };
 
-  # fileSystems."${config.services.immich.mediaLocation}" = {
-  #   device = "${xlib.dirs.services-folder}/immich";
-  #   options = [
-  #     "bind"
-  #     "nofail"
-  #   ];
-  # };
-
   systemd.tmpfiles.rules = [
     "z ${config.services.immich.mediaLocation} 0755 immich immich -"
   ];

modules/server/n8n.nix

@@ -24,6 +24,7 @@
 
   fileSystems."/var/lib/n8n" = {
     device = "${xlib.dirs.services-mnt-folder}/n8n";
+    fsType = "none";
     options = [
       "bind"
       "nofail"

modules/server/nextcloud.nix

@@ -176,14 +176,6 @@ in
   #       };
   #     };
 
-  # fileSystems."${config.services.nextcloud.home}" = {
-  #   device = "${xlib.dirs.services-folder}/nextcloud";
-  #   options = [
-  #     "bind"
-  #     "nofail"
-  #   ];
-  # };
-
   systemd.tmpfiles.rules = [
     "z ${config.services.nextcloud.home} 0750 nextcloud nextcloud -"
   ];

modules/server/postgresql.nix

@@ -23,6 +23,7 @@ in
 
   fileSystems."/var/lib/postgresql" = {
     device = "${xlib.dirs.services-mnt-folder}/postgresql";
+    fsType = "none";
     options = [
       "bind"
       "nofail"

modules/server/uptime-kuma.nix

@@ -21,6 +21,7 @@
 
   fileSystems."/var/lib/private/uptime-kuma" = {
     device = "${xlib.dirs.services-mnt-folder}/uptime-kuma";
+    fsType = "none";
     options = [
       "bind"
       "nofail"

modules/software/beets/default.nix

@@ -77,18 +77,30 @@ in
       };
     };
   };
-  fileSystems."/mnt/beets/music" = {
-    device = "/home/${xlib.device.username}/Music"; # "${xlib.dirs.vetymae-drive}/Users/User/Music"
-    options = [
-      "bind"
-      "uid=1000"
-      "gid=1000"
-      "fmask=0077"
-      "dmask=0077"
-      "nofail"
-      #"x-systemd.device-timeout=0"
-    ];
-  };
+  systemd.mounts = [
+    {
+      enable = true;
+      options = "bind,x-systemd.automount,nofail";
+      requires = [ "local-fs.target" ];
+      type = "none";
+      wantedBy = [ "multi-user.target" ];
+      what = "/home/${xlib.device.username}/Music";
+      where = "/mnt/beets/music";
+    }
+  ];
+  # fileSystems."/mnt/beets/music" = {
+  #   device = "/home/${xlib.device.username}/Music"; # "${xlib.dirs.vetymae-drive}/Users/User/Music"
+  #   fsType = "none";
+  #   options = [
+  #     # "bind"
+  #     "uid=1000"
+  #     "gid=1000"
+  #     "fmask=0077"
+  #     "dmask=0077"
+  #     "nofail"
+  #     #"x-systemd.device-timeout=0"
+  #   ];
+  # };
 
   systemd.tmpfiles.rules = [
     "z /mnt/beets 0700 ${xlib.device.username} users -" # beets absolute paths

modules/vds/nginx.nix

@@ -136,23 +136,23 @@ in
               proxyWebsockets = true;
             };
           };
-          extraConfig = ''
-            client_max_body_size 5G;
+          # extraConfig = ''
+          #   client_max_body_size 5G;
 
-            proxy_http_version 1.1;
-            proxy_buffering off;
+          #   proxy_http_version 1.1;
+          #   proxy_buffering off;
 
-            proxy_set_header Host $host;
-            proxy_set_header X-Forwarded-Host $host;
-            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;
+          #   proxy_set_header Host $host;
+          #   proxy_set_header X-Forwarded-Host $host;
+          #   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;
 
-            proxy_set_header Authorization $http_authorization;
+          #   proxy_set_header Authorization $http_authorization;
 
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-          ''; # absolute_redirect off;
+          #   proxy_set_header Upgrade $http_upgrade;
+          #   proxy_set_header Connection "upgrade";
+          # ''; # absolute_redirect off;
         };
         "immich.zeroq.su" = {
           forceSSL = true;

modules/wsl/default.nix

@@ -13,7 +13,4 @@
     #../server/open-webui.nix
     #../services/tts.nix
   ];
-  environment.systemPackages = [
-    pkgs.rovr
-  ];
 }