diff --git a/hosts/busch/default.nix b/hosts/busch/default.nix index 0d84c12..e6efa4c 100644 --- a/hosts/busch/default.nix +++ b/hosts/busch/default.nix @@ -71,11 +71,6 @@ }; }; - zramSwap = { - enable = true; - memoryPercent = 50; - }; - networking.useDHCP = false; systemd.network = { diff --git a/hosts/busch/disko.nix b/hosts/busch/disko.nix index ca43ce3..5563eae 100644 --- a/hosts/busch/disko.nix +++ b/hosts/busch/disko.nix @@ -91,6 +91,10 @@ 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 67bb7c7..2c88d1a 100644 --- a/modules/docker.nix +++ b/modules/docker.nix @@ -7,7 +7,6 @@ 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 0d7fabe..ad30426 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.32"; + image = "fnsys/dockhand:v1.0.27"; volumes = [ "/var/run/docker.sock:/var/run/docker.sock" ]; diff --git a/modules/netbird-client.nix b/modules/netbird-client.nix index 8477d00..f6429f9 100644 --- a/modules/netbird-client.nix +++ b/modules/netbird-client.nix @@ -94,7 +94,7 @@ in { systemd.services."docker-network-webproxy" = { - path = [ pkgs.docker_29 ]; + path = [ pkgs.docker ]; serviceConfig = { Type = "oneshot"; }; diff --git a/modules/netbird-docker.nix b/modules/netbird-docker.nix index 9792bb4..56c7d6c 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.72.2"; - dashboardVersion = "2.39.0"; + serverVersion = "0.70.5"; + dashboardVersion = "2.38.0"; in { diff --git a/modules/traefik-oidc.nix b/modules/traefik-oidc.nix index c1bff3f..92b1204 100644 --- a/modules/traefik-oidc.nix +++ b/modules/traefik-oidc.nix @@ -206,7 +206,7 @@ in { }; systemd.services."docker-network-traefik" = { - path = [ pkgs.docker_29 ]; + path = [ pkgs.docker ]; serviceConfig = { Type = "oneshot"; }; diff --git a/modules/traefik.nix b/modules/traefik.nix index 322c190..7f4ef6b 100644 --- a/modules/traefik.nix +++ b/modules/traefik.nix @@ -112,7 +112,7 @@ in { }; systemd.services."docker-network-traefik" = { - path = [ pkgs.docker_29 ]; + path = [ pkgs.docker ]; serviceConfig = { Type = "oneshot"; }; @@ -122,7 +122,7 @@ in { }; systemd.services."docker-network-docker-socket" = { - path = [ pkgs.docker_29 ]; + path = [ pkgs.docker ]; serviceConfig = { Type = "oneshot"; };