diff --git a/hosts/busch/default.nix b/hosts/busch/default.nix index e6efa4c..0d84c12 100644 --- a/hosts/busch/default.nix +++ b/hosts/busch/default.nix @@ -71,6 +71,11 @@ }; }; + zramSwap = { + enable = true; + memoryPercent = 50; + }; + networking.useDHCP = false; systemd.network = { diff --git a/hosts/busch/disko.nix b/hosts/busch/disko.nix index 5563eae..ca43ce3 100644 --- a/hosts/busch/disko.nix +++ b/hosts/busch/disko.nix @@ -91,10 +91,6 @@ mountOptions = [ "compress=zstd" ]; mountpoint = "/var/lib/pve-cluster"; }; - "/swap" = { - mountpoint = "/.swapvol"; - swap.swapfile.size = "32G"; - }; }; }; }; diff --git a/modules/docker.nix b/modules/docker.nix index 2c88d1a..67bb7c7 100644 --- a/modules/docker.nix +++ b/modules/docker.nix @@ -7,6 +7,7 @@ virtualisation = { docker = { enable = true; + package = pkgs.docker_29; daemon.settings = { ipv6 = true; ip6tables = true; diff --git a/modules/dockhand.nix b/modules/dockhand.nix index ad30426..0d7fabe 100644 --- a/modules/dockhand.nix +++ b/modules/dockhand.nix @@ -17,7 +17,7 @@ in { config = lib.mkIf cfg.enable { virtualisation.oci-containers.containers = { dockhand = { - image = "fnsys/dockhand:v1.0.27"; + image = "fnsys/dockhand:v1.0.32"; volumes = [ "/var/run/docker.sock:/var/run/docker.sock" ]; diff --git a/modules/netbird-client.nix b/modules/netbird-client.nix index f6429f9..8477d00 100644 --- a/modules/netbird-client.nix +++ b/modules/netbird-client.nix @@ -94,7 +94,7 @@ in { systemd.services."docker-network-webproxy" = { - path = [ pkgs.docker ]; + path = [ pkgs.docker_29 ]; serviceConfig = { Type = "oneshot"; }; diff --git a/modules/netbird-docker.nix b/modules/netbird-docker.nix index 56c7d6c..9792bb4 100644 --- a/modules/netbird-docker.nix +++ b/modules/netbird-docker.nix @@ -10,8 +10,8 @@ let cfg = config.services.netbird-docker; netbirdCfg = config.services.netbird; - serverVersion = "0.70.5"; - dashboardVersion = "2.38.0"; + serverVersion = "0.72.2"; + dashboardVersion = "2.39.0"; in { diff --git a/modules/traefik-oidc.nix b/modules/traefik-oidc.nix index 92b1204..c1bff3f 100644 --- a/modules/traefik-oidc.nix +++ b/modules/traefik-oidc.nix @@ -206,7 +206,7 @@ in { }; systemd.services."docker-network-traefik" = { - path = [ pkgs.docker ]; + path = [ pkgs.docker_29 ]; serviceConfig = { Type = "oneshot"; }; diff --git a/modules/traefik.nix b/modules/traefik.nix index 7f4ef6b..322c190 100644 --- a/modules/traefik.nix +++ b/modules/traefik.nix @@ -112,7 +112,7 @@ in { }; systemd.services."docker-network-traefik" = { - path = [ pkgs.docker ]; + path = [ pkgs.docker_29 ]; serviceConfig = { Type = "oneshot"; }; @@ -122,7 +122,7 @@ in { }; systemd.services."docker-network-docker-socket" = { - path = [ pkgs.docker ]; + path = [ pkgs.docker_29 ]; serviceConfig = { Type = "oneshot"; };