Cleaning up filesystems version

configuration.nix

@@ -18,23 +18,6 @@
   boot.loader.systemd-boot.configurationLimit = 30;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  #
-  # hardware.graphics.enable = true;
-  #
-  # hardware.nvidia = {
-  #   modesetting.enable = true;
-  #
-  #   open = false; # Recommended for GTX 1060
-  #
-  #   nvidiaSettings = true;
-  #
-  #   package = config.boot.kernelPackages.nvidiaPackages.stable;
-  # };
-  #
-  # environment.sessionVariables = {
-  #   NIXOS_OZONE_WL = "1";
-  # };
-
   boot.kernel.sysctl = {
     "net.ipv4.ip_forward" = 1;
     "net.bridge.bridge-nf-call-iptables" = 1;
@@ -44,60 +27,60 @@
     "net.ipv4.conf.ens2.proxy_arp" = 1;
   };
   nixpkgs.config.allowUnfree = true;
+  fileSystems = {
+    "/mnt/games" = {
+      device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
+      fsType = "btrfs";
+      options = [
+        "users"
+        "compress=zstd"
+        "subvol=@games"
+        "nofail"
+      ];
+    };
+    "/mnt/photo" = {
+      device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
+      fsType = "btrfs";
+      options = [
+        "users"
+        "compress=zstd"
+        "subvol=@Pictures"
+        "nofail"
+      ];
+    };
 
-  fileSystems."/mnt/games" = {
+    "/mnt/media" = {
-    device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
+      device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
-    fsType = "btrfs";
+      fsType = "btrfs";
-    options = [
+      options = [
-      "users"
+        "users"
-      "compress=zstd"
+        "compress=zstd"
-      "subvol=@games"
+        "subvol=@media"
-      "nofail"
+        "nofail"
-    ];
+      ];
-  };
+    };
 
-  fileSystems."/mnt/photo" = {
+    "/mnt/winbackup" = {
-    device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
+      device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
-    fsType = "btrfs";
+      fsType = "btrfs";
-    options = [
+      options = [
-      "users"
+        "users"
-      "compress=zstd"
+        "compress=zstd"
-      "subvol=@Pictures"
+        "subvol=@winbackup"
-      "nofail"
+        "nofail"
-    ];
+      ];
-  };
+    };
 
-  fileSystems."/mnt/media" = {
+    "/mnt/winhdd" = {
-    device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
+      device = "/dev/sdb1";
-    fsType = "btrfs";
+      fsType = "ntfs";
-    options = [
+      options = [
-      "users"
+        "users"
-      "compress=zstd"
+        "windows_names"
-      "subvol=@media"
+        "noatime"
-      "nofail"
+        "nofail"
-    ];
+      ];
-  };
+    };
-
-  fileSystems."/mnt/winbackup" = {
-    device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
-    fsType = "btrfs";
-    options = [
-      "users"
-      "compress=zstd"
-      "subvol=@winbackup"
-      "nofail"
-    ];
-  };
-
-  fileSystems."/mnt/winhdd" = {
-    device = "/dev/sdb1";
-    fsType = "ntfs";
-    options = [
-      "users"
-      "windows_names"
-      "noatime"
-      "nofail"
-    ];
   };
 
   virtualisation.libvirtd = {
@@ -157,7 +140,6 @@
     "dedyn/dnsuser" = {};
     "github/token" = {};
     "gitlab/token" = {};
-    "openai/legacy_token" = {};
   };
 
   sops.templates."factorio.json".content = builtins.toJSON {
@@ -166,11 +148,9 @@
     gamepassword = config.sops.placeholder."factorio/gamepassword";
   };
 
-  sops.templates."duplicity.env".content = builtins.toJSON {
+  sops.templates."duplicity.env".content =
-    service_username = config.sops.placeholder."factorio/service_username";
+    builtins.toJSON {
-    service_token = config.sops.placeholder."factorio/service_token";
+    };
-    gamepassword = config.sops.placeholder."factorio/gamepassword";
-  };
 
   sops.templates."caddy.env" = {
     owner = "root";
@@ -213,12 +193,11 @@
     openFirewall = true;
   };
 
-  # programs.firefox.enable = true;
-
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
 
   programs.hyprland.enable = true; # enable Hyprland
+
   programs.nix-ld = {
     enable = true;
 
@@ -240,6 +219,8 @@
   };
 
   environment.systemPackages = with pkgs; [
+    doas
+    lan-mouse
     stylua
     gh
     glab
@@ -265,7 +246,6 @@
     OVMF
     pigz
     mpv
-    zed
     wofi
     wayvnc
     pcmanfm
@@ -305,6 +285,7 @@
 
   services.caddy = {
     enable = true;
+    environmentFile = config.sops.templates."caddy.env".path;
     globalConfig = ''
       acme_ca https://acme.zerossl.com/v2/DV90
       email {$ACME_EMAIL};
@@ -312,6 +293,11 @@
 
     #tls ${config.sops.secrets.zerossl_cert.path} ${config.sops.secrets.zerossl_private_key.path}
     virtualHosts."centraldogma.dedyn.io:".extraConfig = ''
+
+      root * /srv/root/
+      file_server
+      encode zstd gzip
+
       redir /jellyfin /jellyfin/
       reverse_proxy /jellyfin/* 127.0.0.1:8096
 
@@ -322,6 +308,12 @@
       reverse_proxy /radarr/* 127.0.0.1:7878
 
     '';
+
+    virtualHosts."blog.centraldogma.dedyn.io:".extraConfig = ''
+      root * /srv/root/
+      file_server
+      encode zstd gzip
+    '';
   };
   services.flaresolverr = {
     enable = true;
@@ -369,14 +361,7 @@
         "create mask" = "0644";
         "directory mask" = "0755";
       };
-      "x" = {
+
-        "path" = "/home/mask/mounts/x";
-        "browseable" = "yes";
-        "read only" = "no";
-        "guest ok" = "no";
-        "create mask" = "0644";
-        "directory mask" = "0755";
-      };
       "winhdd" = {
         "path" = "/mnt/winhdd";
         "browseable" = "yes";