add semi colons

flake.lock

@@ -127,11 +127,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1783148766,
+        "lastModified": 1783389287,
-        "narHash": "sha256-uslt2pqShTIXDdAHRHv2QkYLsVdY8Oqwz0EA48/RSM8=",
+        "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a50de1b7d8a586adc18d2395c19de7d6058e6030",
+        "rev": "0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c",
         "type": "github"
       },
       "original": {

hosts/docker/configuration.nix

@@ -17,8 +17,6 @@ in
       ../../common/configuration.nix
       ../../modules/nix/cache-client.nix
       ../../modules/nix/remote-builder-client.nix
-#      ../../modules/nix/mount-docker-config.nix
-#      ../../modules/nix/mount-docker-volumes.nix
       ../../modules/nix/docker-data.nix
     ];
 
@@ -43,6 +41,15 @@ boot.zfs.forceImportRoot = false;
 #    experimental = true;
 #  };
 };
+
+services.beszel.agent.enable = true;
+services.beszel.agent.environment = {
+DOCKER_HOST = "tcp://docker-socket-proxy:2375";
+HUB_URL = "http://beszel:8090";
+KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA2Snq66P/6GwTEafKuu3D/V1f7ofjKL9GD6ik+Kf/Gn";
+TOKEN = "235b3-25a94f482-84576-40d34c48";
+};
+
   services.tailscale.enable = true;
   # Enable docker-compose
   environment.systemPackages = with pkgs; [
@@ -120,23 +127,23 @@ systemd.timers.nextcloud = {
 };
 
 # Create nextcloud cron scheduled task
-systemd.services.docker-prune = {
+# systemd.services.docker-prune = {
-  description = "Prune docker data";
+#   description = "Prune docker data";
-  script = ''${pkgs.docker} system prune --volumes --all --force'';
+#   script = ''${pkgs.docker} system prune --volumes --all'';
-  serviceConfig = {
+#   serviceConfig = {
-    Type = "oneshot";
+#     Type = "oneshot";
-    User = "nixos";
+#     User = "nixos";
-  };
+#   };
-  path = with pkgs; [ docker docker-compose ];
+#   path = with pkgs; [ docker docker-compose ];
-};
+# };
 
-systemd.timers.docker-prune = {
+# systemd.timers.docker-prune = {
-  wantedBy = [ "timers.target" ];
+#   wantedBy = [ "timers.target" ];
-  timerConfig = {
+#   timerConfig = {
-    OnCalendar = "monthly";
+#     OnCalendar = "monthly";
-    Persistent = true;
+#     Persistent = true;
-  };
+#   };
-};
+# };
     
 # create update task
 
@@ -195,12 +202,20 @@ systemd.timers.docker-prune = {
     };
   };
 
+systemd.tmpfiles.rules = [
+  # Create /mnt/docker
+  #"d /mnt/docker 0755 root root -"
 
+  # Create /home/nixos/docker -> /mnt/docker-config
+  "L+ /home/nixos/docker - - - - /mnt/docker/config"
+  "d /mnt/docker 0755 nixos users -"
+
+];
 
 #Add sym links to data on users home folder
-system.userActivationScripts.createDockerSymlink.text = ''
+#system.userActivationScripts.createDockerSymlink.text = ''
-  ln -sf /mnt/docker-config /home/nixos/docker
+#  ln -sf /mnt/docker/config /home/nixos/docker
-'';
+#'';
 #system.userActivationScripts.createSetupSymlink.text = ''
 #  ln -sf /mnt/docker-persistent-data/setup /home/nixos/setup
 #'';

hosts/server/configuration.nix

@@ -12,6 +12,8 @@
       ../../common/configuration.nix
       ../../modules/nix/cache-client.nix
       ../../modules/nix/remote-builder-client.nix
+#      ../../modules/nix/tailscale-exit-node.nix
+#      ../../modules/nix/enable-ip-forwarding.nix
     ];
 
     

modules/nix/cache-server.nix

@@ -41,7 +41,8 @@
     openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFDEA1S2ikpObREgbP5uVBWMxIOGbY8B+Wx7VTZK1m6t root@server"
 					"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPAYIT9ormlmxZ0SziyDQaUntnKI8HK9/s3Qac1ZKjP2 root@docker" 
 					"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKKKzoEPl/ZW9KBRHBcp6/ThOngGpwMv5EhkTlgC4aDf root@nixos"
-					"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIGtOWOCS+ImHc7NehguoyD7PbonGosKMZqc9+QR3v/h root@nixos"];
+					"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIGtOWOCS+ImHc7NehguoyD7PbonGosKMZqc9+QR3v/h root@nixos"
+					"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxXTQxFnArK5HXG7czeoybZebCGfxpUdusJkPn+BCSp root@server"];
   };
 
   services.openssh.enable = true;

modules/nix/docker-data.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  fileSystems."/mnt/docker-config" = {
+  fileSystems."/mnt/docker/config" = {
     device = "server:/tank/docker/config";
     fsType = "nfs";
 
@@ -13,7 +13,7 @@
     ];
   };
 
-  fileSystems."/mnt/docker-databases" = {
+  fileSystems."/mnt/docker/databases" = {
     device = "server:/tank/docker/databases";
     fsType = "nfs";
 
@@ -25,7 +25,7 @@
     ];
   };
 
-  fileSystems."/mnt/docker-volumes" = {
+  fileSystems."/mnt/docker/volumes" = {
     device = "server:/tank/docker/volumes";
     fsType = "nfs";
 
@@ -49,16 +49,4 @@
     ];
   };
 
- fileSystems."/mnt/docker/test" = {
-    device = "server:/tank/docker/nextcloud-data";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-
 }

modules/nix/enable-ip-forwarding.nix

@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+
+{
+  options.myNetworking.ipForwarding.enable = lib.mkEnableOption "Enable IPv4 and IPv6 forwarding";
+
+  config = lib.mkIf config.myNetworking.ipForwarding.enable {
+    boot.kernel.sysctl = {
+      "net.ipv4.ip_forward" = 1;
+      "net.ipv6.conf.all.forwarding" = 1;
+    };
+  };
+}

modules/nix/mount-docker-config.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  fileSystems."/mnt/docker-config" = {
-    device = "server:/tank/docker/config";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-}

modules/nix/mount-docker-databases.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  fileSystems."/mnt/docker-databases" = {
-    device = "server:/tank/docker/databases";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-}

modules/nix/mount-docker-volumes.nix

@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  fileSystems."/mnt/docker-volumes" = {
-    device = "server:/tank/docker/volumes";
-    fsType = "nfs";
-
-    options = [
-      "nfsvers=4.2"
-      "_netdev"
-      "x-systemd.automount"
-      "noatime"
-    ];
-  };
-}

modules/nix/tailscale-exit-node.nix

@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  services.tailscale = {
+    enable = true;
+
+    extraUpFlags = [
+      "--advertise-exit-node"
+      "--advertise-routes=192.168.2.0/24"
+    ];
+  };
+}