flake.lock

@@ -476,11 +476,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1781207988,
+        "lastModified": 1779441912,
-        "narHash": "sha256-ZsPqHeeUXDR1fksT4EGlizv8RHPHp42kusVNhnenzxo=",
+        "narHash": "sha256-Le50mFgpetFC8gyc1j3+oXEjRV3lZdeU2vqBtoWaAJo=",
         "ref": "refs/heads/main",
-        "rev": "53c5bdca5f2ff22b4e950c38b4d8bb96ee03c80d",
+        "rev": "847ed2f52fd5ff0ead5958d6932b219b4254a2bf",
-        "revCount": 40,
+        "revCount": 38,
         "type": "git",
         "url": "ssh://git@git.jfreudenberger.de/JuliusFreudenberger/nix-private.git"
       },

flake.nix

@@ -136,7 +136,6 @@
         modules = [
           ./hosts/busch
           disko.nixosModules.disko
-          agenix.nixosModules.default
           proxmox-nixos.nixosModules.proxmox-ve
 
           ({...}: {

hosts/busch-gpu-docker/default.nix

@@ -56,15 +56,6 @@
     tokenSecretFile = config.age.secrets.hawser-token;
   };
 
-  services.beszel.agent = {
-    enable = true;
-    environment = {
-      HUB_URL = "https://beszel.jfreudenberger.de";
-      DISABLE_SSH = "true";
-    };
-    environmentFile = config.age.secrets.beszel.path;
-  };
-
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
   # Most users should NEVER change this value after the initial install, for any reason,

hosts/busch-gpu-docker/secrets.nix

@@ -2,6 +2,5 @@
 {
   age.secrets = {
     hawser-token.file = "${inputs.secrets}/secrets/busch-gpu-docker/hawser-token";
-    beszel.file = "${inputs.secrets}/secrets/busch-gpu-docker/beszel";
   };
 }

hosts/busch-main-docker/default.nix

@@ -44,15 +44,6 @@
     tokenSecretFile = config.age.secrets.hawser-token;
   };
 
-  services.beszel.agent = {
-    enable = true;
-    environment = {
-      HUB_URL = "https://beszel.jfreudenberger.de";
-      DISABLE_SSH = "true";
-    };
-    environmentFile = config.age.secrets.beszel.path;
-  };
-
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
   # Most users should NEVER change this value after the initial install, for any reason,

hosts/busch-main-docker/secrets.nix

@@ -2,6 +2,5 @@
 {
   age.secrets = {
     hawser-token.file = "${inputs.secrets}/secrets/busch-main-docker/hawser-token";
-    beszel.file = "${inputs.secrets}/secrets/busch-main-docker/beszel";
   };
 }

hosts/busch/default.nix

@@ -4,7 +4,6 @@
   imports =
     [
       ./disko.nix
-      ./secrets.nix
 
       ../../modules/nix.nix
       ../../modules/auto-upgrade.nix
@@ -30,31 +29,21 @@
 
   networking.hostName = "busch"; # Define your hostname.
 
-  services = {
+  services.netbird = {
-    netbird = {
+    package = pkgs-unstable.netbird;
-      package = pkgs-unstable.netbird;
+    useRoutingFeatures = "both";
-      useRoutingFeatures = "both";
+    clients.wt0 = {
-      clients.wt0 = {
+      hardened = false;
-        hardened = false;
+      login = {
-        login = {
+        enable = true;
-          enable = true;
+        setupKeyFile = (pkgs.writeText "setupKey" ''
-          setupKeyFile = (pkgs.writeText "setupKey" ''
+          A99F5508-D543-40B7-A31A-A8931B1AE246
-            A99F5508-D543-40B7-A31A-A8931B1AE246
+        '').outPath;
-          '').outPath;
-        };
-        port = 51820;
-        environment = {
-          NB_MANAGEMENT_URL = "https://netbird.jfreudenberger.de";
-        };
       };
-    };
+      port = 51820;
-    beszel.agent = {
-      enable = true;
       environment = {
-        HUB_URL = "https://beszel.jfreudenberger.de";
+        NB_MANAGEMENT_URL = "https://netbird.jfreudenberger.de";
-        DISABLE_SSH = "true";
       };
-      environmentFile = config.age.secrets.beszel.path;
     };
   };
   systemd.services.${config.services.netbird.clients.wt0.service.name}.path = [ pkgs.shadow ];

hosts/busch/secrets.nix

@@ -1,6 +0,0 @@
-{ inputs, ... }:
-{
-  age.secrets = {
-    beszel.file = "${inputs.secrets}/secrets/busch/beszel";
-  };
-}

hosts/srv03/default.nix

@@ -16,7 +16,6 @@
       ../../modules/docker.nix
       ../../modules/traefik.nix
       ../../modules/pocket-id.nix
-      ../../modules/beszel-hub.nix
       ../../modules/netbird-docker.nix
       ../../modules/netbird-client.nix
       ../../modules/dockhand.nix
@@ -52,11 +51,6 @@
       appUrl = "dockhand.jfreudenberger.de";
     };
 
-    beszel-docker = {
-      enable = true;
-      appUrl = "https://beszel.jfreudenberger.de";
-    };
-
     netbird-docker = {
       enable = true;
       secrets = config.age.secrets.netbird-server;

hosts/xcy/default.nix

@@ -33,15 +33,6 @@
     tokenSecretFile = config.age.secrets.hawser-token;
   };
 
-  services.beszel.agent = {
-    enable = true;
-    environment = {
-      HUB_URL = "https://beszel.jfreudenberger.de";
-      DISABLE_SSH = "true";
-    };
-    environmentFile = config.age.secrets.beszel.path;
-  };
-
   networking.firewall = {
     checkReversePath = "loose";
     allowedTCPPorts = [

hosts/xcy/secrets.nix

@@ -2,6 +2,5 @@
 {
   age.secrets = {
     hawser-token.file = "${inputs.secrets}/secrets/xcy/hawser-token";
-    beszel.file = "${inputs.secrets}/secrets/xcy/beszel";
   };
 }

modules/beszel-hub.nix

@@ -1,58 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-let
-
-  cfg = config.services.beszel-docker;
-  version = "0.18.7";
-
-in {
-
-  options.services.beszel-docker = {
-    enable = lib.mkEnableOption "Beszel hub hosted as OCI container";
-    appUrl = lib.mkOption {
-      description = "URL of the beszel hub";
-      type = lib.types.str;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    virtualisation.oci-containers.containers = {
-      beszel = {
-        image = "henrygd/beszel:${version}";
-        autoStart = true;
-        networks = [
-          "traefik"
-        ];
-        environment = {
-          APP_URL = cfg.appUrl;
-        };
-        extraOptions = [
-          ''--mount=type=volume,source=data,target=/beszel_data,volume-driver=local''
-          /*''--health-cmd=["/beszel" "health" "--url" "http://localhost:8090"]''
-          "--health-interval=120s"
-          "--health-timeout=5s"
-          "--health-retries=2"
-          "--health-start-period=10s"*/
-        ];
-        labels = {
-          "traefik.enable" = "true";
-          "traefik.http.routers.beszel.rule" = "Host(`${lib.removePrefix "https://" cfg.appUrl}`)";
-          "traefik.http.routers.beszel.entrypoints" = "websecure";
-        };
-      };
-    };
-
-    systemd.services."docker-beszel" = {
-      after = [
-        "docker-traefik.service"
-      ];
-      requires = [
-        "docker-traefik.service"
-      ];
-    };
-
-  };
-}

modules/i3.nix

@@ -41,7 +41,6 @@
 	pinentry-gnome3
 	xdotool
 	playerctl
-        networkmanager_dmenu
       ];
     };
 

modules/pocket-id.nix

@@ -7,7 +7,7 @@ let
 
   cfg = config.services.pocket-id-docker;
   pocketidCfg = config.services.pocket-id;
-  version = "2.8.0";
+  version = "2.6.2";
 
 in {
 

modules/traefik.nix

@@ -7,7 +7,7 @@
 let
 
   cfg = config.services.traefik-docker;
-  version = "3.7.5";
+  version = "3.6.14";
 
 in {