diff --git a/home/gram.nix b/home/gram.nix index 42a47b5..1c76bfa 100644 --- a/home/gram.nix +++ b/home/gram.nix @@ -21,6 +21,10 @@ pkgs.tinymist pkgs.tofu-ls pkgs.ltex-ls-plus + pkgs.vtsls + pkgs.vscode-langservers-extracted + pkgs.vscode-json-languageserver + pkgs.package-version-server ]; userSettings = { theme = { diff --git a/hosts/srv03/default.nix b/hosts/srv03/default.nix index d2cacb1..fef7d76 100644 --- a/hosts/srv03/default.nix +++ b/hosts/srv03/default.nix @@ -63,6 +63,9 @@ proxy = { domain = "netbird.jfreudenberger.de"; token-secret = config.age.secrets.netbird-proxy; + extraPorts = [ + "222:222/tcp" # Forgejo SSH routing + ]; }; }; netbird.server = let diff --git a/modules/netbird-client.nix b/modules/netbird-client.nix index 1c827e4..a07e283 100644 --- a/modules/netbird-client.nix +++ b/modules/netbird-client.nix @@ -62,7 +62,7 @@ in { virtualisation.oci-containers.containers = lib.mkIf (cfg.docker.setupKey != null) { netbird = { - image = "netbirdio/netbird:v0.74.7-rootless@sha256:dd545478026df785ce44e4b512fa11e5b0d1e7d94463c96a50675d72655050a0"; + image = "netbirdio/netbird:v0.74.6-rootless@sha256:21516faecb7ddd9d6207ebcb1196da57bfe6a6fb8cd4fc9693482bf5a4917bcf"; autoStart = true; hostname = "${config.networking.hostName}-docker"; networks = [ diff --git a/modules/netbird-docker.nix b/modules/netbird-docker.nix index e524f62..3b44a86 100644 --- a/modules/netbird-docker.nix +++ b/modules/netbird-docker.nix @@ -57,7 +57,7 @@ in { services.netbird.useRoutingFeatures = lib.mkDefault "server"; virtualisation.oci-containers.containers = { netbird-dashboard = { - image = "netbirdio/dashboard:v2.90.5"; + image = "netbirdio/dashboard:v2.90.4"; autoStart = true; networks = [ "traefik" @@ -91,7 +91,7 @@ in { ]; }; netbird-server = { - image = "netbirdio/netbird-server:0.74.7@sha256:ec97e2fcdf9666af849c293eeaaf0f4ff742f4f6e886d8873f129de8f4f6b7ef"; + image = "netbirdio/netbird-server:0.74.6@sha256:049873c3d498b0cc1fbb4b87873b6388e23a768f45f056ec04dc0751e505610c"; autoStart = true; networks = [ "traefik" @@ -169,7 +169,7 @@ in { ]; }; netbird-proxy = { - image = "netbirdio/reverse-proxy:0.74.7@sha256:302d9e38a8ee2425102c680cdb62f6b552cdf645505e825f753b0b751018cbf8"; + image = "netbirdio/reverse-proxy:0.74.6@sha256:05900cefab7928580a94274a8c8fecd8f4b62e447b618f6e43a45328201c5ee7"; autoStart = true; ports = [ "51820:51820/udp" diff --git a/modules/traefik.nix b/modules/traefik.nix index 971d14b..98a997e 100644 --- a/modules/traefik.nix +++ b/modules/traefik.nix @@ -93,7 +93,7 @@ in { ]; }; docker-socket-proxy = { - image = "tecnativa/docker-socket-proxy:v0.4.2"; + image = "tecnativa/docker-socket-proxy:v0.4.2@sha256:1f3a6f303320723d199d2316a3e82b2e2685d86c275d5e3deeaf182573b47476"; autoStart = true; networks = [ "docker-socket" diff --git a/renovate.json b/renovate.json index efb4b22..c426941 100644 --- a/renovate.json +++ b/renovate.json @@ -8,7 +8,7 @@ "groupName": "netbird" }, { - "matchSourceUrls": "git+ssh://git@git.jfreudenberger.de/JuliusFreudenberger/nix-private.git", + "matchPackageNames": "ssh://git@git.jfreudenberger.de/JuliusFreudenberger/nix-private.git", "enabled": false } ],