12 files changed, 109 insertions, 133 deletions

diff --git a/flake.lock b/flake.lock
index 486fe843..35735283 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1148,25 +1148,34 @@
     "prometheus-borg-exporter": {
       "inputs": {
         "flake-parts": "flake-parts_4",
+        "gitignore": [
+          "gitignore"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
-        "poetry2nix": [
-          "poetry2nix"
+        "pre-commit-hooks-nix": "pre-commit-hooks-nix_4",
+        "pyproject-build-systems": [
+          "pyproject-build-systems"
+        ],
+        "pyproject-nix": [
+          "pyproject-nix"
         ],
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix_4"
+        "uv2nix": [
+          "uv2nix"
+        ]
       },
       "locked": {
-        "lastModified": 1722088088,
-        "narHash": "sha256-54U68THNc/0iIBmJAef8pJZHmwjFvHMCRB5cO/ilgY0=",
+        "lastModified": 1776181320,
+        "narHash": "sha256-bvnKBrO7oRFPB/YGloYEM3/Ch1jiW2EfKC7qbONIQao=",
         "owner": "gkleen",
         "repo": "prometheus-borg-exporter",
-        "rev": "d820cbd5ba27f5d90546fdcef3dff3d69e776149",
+        "rev": "0a3b26eca91630e933b14e2d5e4bd2e4be5bc911",
         "type": "gitlab"
       },
       "original": {
         "owner": "gkleen",
-        "ref": "main",
+        "ref": "v1.1.1",
         "repo": "prometheus-borg-exporter",
         "type": "gitlab"
       }
diff --git a/flake.nix b/flake.nix
index 3452ee9a..8a230dd2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -174,10 +174,13 @@
       type = "gitlab";
       owner = "gkleen";
       repo = "prometheus-borg-exporter";
-      ref = "main";
+      ref = "v1.1.1";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        poetry2nix.follows = "poetry2nix";
+        pyproject-nix.follows = "pyproject-nix";
+        uv2nix.follows = "uv2nix";
+        pyproject-build-systems.follows = "pyproject-build-systems";
+        gitignore.follows = "gitignore";
       };
     };
     nixos-hardware = {
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 9639cbd3..f15dfebe 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -296,41 +296,6 @@ with lib;
         "ASSUME_NO_MOVING_GC_UNSAFE_RISK_IT_WITH=go1.19"
       ];
     };
-    services.promtail = {
-      enable = true;
-      configuration = {
-        server = {
-          http_listen_port = 9080;
-          grpc_listen_port = 0;
-        };
-        clients = [
-          { url = "http://localhost:9094/loki/api/v1/push"; }
-        ];
-        scrape_configs = [
-          { job_name = "journal";
-            journal = {
-              json = true;
-              max_age = "12h";
-              path = "/var/log/journal";
-              labels = {
-                job = "systemd-journal";
-              };
-            };
-            relabel_configs = [
-              { source_labels = ["__journal__systemd_unit"];
-                target_label = "unit";
-              }
-              { source_labels = ["__journal__hostname"];
-                target_label = "nodename";
-              }
-            ];
-          }
-        ];
-      };
-    };
-    systemd.services.promtail.serviceConfig.Environment = [
-      "ASSUME_NO_MOVING_GC_UNSAFE_RISK_IT_WITH=go1.19"
-    ];
 
     services.apcupsd = {
       enable = true;
diff --git a/hosts/vidhar/network/default.nix b/hosts/vidhar/network/default.nix
index 02a8d648..3b48a7fc 100644
--- a/hosts/vidhar/network/default.nix
+++ b/hosts/vidhar/network/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 {
-  imports = [ ./pppoe.nix ./bifrost ./dhcp ];
+  imports = [ ./pppoe ./bifrost ./dhcp ];
 
   config = {
     networking = {
@@ -132,6 +132,7 @@ with lib;
       "/srv/nfs/nix-store" = {
         device = "/nix/store";
         options = [ "bind" ];
+        fsType = "none";
       };
     };
   };
diff --git a/hosts/vidhar/network/pppoe.nix b/hosts/vidhar/network/pppoe/default.nix
index 7b342b69..36bf4f49 100644
--- a/hosts/vidhar/network/pppoe.nix
+++ b/hosts/vidhar/network/pppoe/default.nix
@@ -27,7 +27,37 @@ in {
           ./no-double-timeout.patch
         ];
       });
-      peers.telekom.config = ''
+      peers = {
+        o2.config = ''
+          user DSL0004874856014@s93.bbi-o2.de
+        '';
+      };
+    };
+    systemd.services."pppd-o2" = {
+      stopIfChanged = true;
+
+      restartTriggers = with config; [
+        environment.etc."ppp/pap-secrets".source
+        environment.etc."ppp/options".source
+        environment.etc."ppp/ip-pre-up".source
+        environment.etc."ppp/ip-up".source
+        environment.etc."ppp/ip-down".source
+      ];
+
+      serviceConfig.LoadCredential = [
+        "password:${config.sops.secrets."o2-password".path}"
+      ];
+
+      bindsTo = [ "sys-subsystem-net-devices-telekom.device" ];
+      after = [ "sys-subsystem-net-devices-telekom.device" ];
+    };
+    sops.secrets."o2-password" = {
+      format = "binary";
+      sopsFile = ./o2-password;
+    };
+
+    environment.etc = {
+      "ppp/options".text = ''
         nodefaultroute
         ifname ${pppInterface}
         lcp-echo-adaptive
@@ -39,29 +69,14 @@ in {
         plugin pppoe.so
         pppoe-padi-timeout 1
         pppoe-padi-attempts 10
-        user congstar
-        password congstar
         nic-telekom
         debug
         +ipv6
       '';
-    };
-    systemd.services."pppd-telekom" = {
-      stopIfChanged = true;
-
-      serviceConfig = {
-        Type = lib.mkForce "notify";
-        ExecStart = lib.mkForce "${getBin config.services.pppd.package}/sbin/pppd call telekom up_sdnotify nolog";
-        PIDFile = "/run/pppd/${pppInterface}.pid";
-      };
-      restartTriggers = with config; [
-        environment.etc."ppp/ip-pre-up".source
-        environment.etc."ppp/ip-up".source
-        environment.etc."ppp/ip-down".source
-      ];
-    };
-
-    environment.etc = {
+      "ppp/pap-secrets".text = ''
+        congstar * congstar *
+        DSL0004874856014@s93.bbi-o2.de * @/run/credentials/pppd-o2.service/password *
+      '';
       "ppp/ip-pre-up".source = pkgs.resholve.writeScript "ip-pre-up" {
         interpreter = pkgs.runtimeShell;
         inputs = [ pkgs.iproute2 pkgs.ethtool ];
@@ -137,9 +152,5 @@ in {
       "net.core.rmem_max" = 4194304;
       "net.core.wmem_max" = 4194304;
     };
-    systemd.services."pppd-telekom" = {
-      bindsTo = [ "sys-subsystem-net-devices-telekom.device" ];
-      after = [ "sys-subsystem-net-devices-telekom.device" ];
-    };
   };
 }
diff --git a/hosts/vidhar/network/no-double-timeout.patch b/hosts/vidhar/network/pppoe/no-double-timeout.patch
index 53f41ae1..53f41ae1 100644
--- a/hosts/vidhar/network/no-double-timeout.patch
+++ b/hosts/vidhar/network/pppoe/no-double-timeout.patch
diff --git a/hosts/vidhar/network/pppoe/o2-password b/hosts/vidhar/network/pppoe/o2-password
new file mode 100644
index 00000000..cd3aed78
--- /dev/null
+++ b/hosts/vidhar/network/pppoe/o2-password
@@ -0,0 +1,18 @@
+{
+        "data": "ENC[AES256_GCM,data:mxHA3rrs5Sc50jAP,iv:iW1ua7wjZR8rPwXw21TdFK+fbfosc1CmnrTG34OJ2zM=,tag:pZ/FAHupnKy0wHtF6RN7yA==,type:str]",
+        "sops": {
+                "age": [
+                        {
+                                "recipient": "age1rmmhetcmllq0ahl5qznlr0eya2zdxwl9h6y5wnl97d2wtyx5t99sm2u866",
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpUzAvSlJkSFhhRTFLY0VO\nU1VYbFhpMEpxaFhlb2NyS0xDNU5oMm9EZzJnCm5vbTM4c3lFMU5EajhwTGd6MTVx\nZTFmNVlyaVZuRy9hL2VnWFR0TTNEemsKLS0tIDdTemNMTTllQ1pmb0JNTlVGcTlU\nWjQ2MW4yVmtvRng3TlRDbmpHdmRkbUEKtIVAq4aZD6rhtX7+67EE5eOKAtGsVpBg\nPkfjkyV8ifBEx/lwDaJSHpLPfkbI9oArTL8BloodJEEGql5PXZxtvg==\n-----END AGE ENCRYPTED FILE-----\n"
+                        },
+                        {
+                                "recipient": "age1qffdqvy9arld9zd5a5cylt0n98xhcns5shxhrhwjq5g4qa844ejselaa4l",
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmUk1oZGdjL25YbGRzdFFh\nRllkcU1IM0x6a2M2S0JicDBFYnBxMWluaEFzCjJ3WHozNkw0RThCMG5BNE5uUkZa\nTnV1OHpaSkMrTk9XM1NRWmxlTmRuUFkKLS0tIE9qdXVWOG9CL0MyS1JXbzhmbVdC\nZlRBWm1SSTZWYzBDc1U4ci94a0hMcHcKLgbJSAMUJ9VaXVmYQe+Uj13KrWFe4QvJ\nRcibCyOJH/VO3rmxU8RAkx0jaH448h9klWhs583Od5yNg7GleC+/qg==\n-----END AGE ENCRYPTED FILE-----\n"
+                        }
+                ],
+                "lastmodified": "2026-04-14T15:24:19Z",
+                "mac": "ENC[AES256_GCM,data:/dr0bXAf0v5K9LdKw7RzTTL8Qw/WqiHqLk0EbahDnFg3cVplV0s+ImCnxmhutv3hxdtMZ2dmLBfb8CYb/ZLc4HtNT/K2iKGQM7pF4+XxIjS35Q1JUcXxLrsGZcpARuCZ0AJnKo8yFgtM64dYcbxHlRwGG4u4Ds9fEHHLUMigNM0=,iv:jfFlfscUB7S1JjL/uBeW3uD4bugCT9Cj/vigGvGXrlA=,tag:suol02QD4jRH/QulWoV21A==,type:str]",
+                "version": "3.12.2"
+        }
+}
diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix
index 35942c53..c0941688 100644
--- a/hosts/vidhar/prometheus/default.nix
+++ b/hosts/vidhar/prometheus/default.nix
@@ -59,7 +59,7 @@ in {
         systemd = {
           enable = true;
           extraFlags = [
-            "--systemd.collector.unit-include=(dhcpcd|pppd-telekom|radvd|ndppd)\.service"
+            "--systemd.collector.unit-include=(dhcpcd|pppd-.+|radvd|ndppd)\.service"
             "--systemd.collector.enable-restart-count"
             "--systemd.collector.enable-ip-accounting"
           ];
@@ -202,13 +202,6 @@ in {
           relabel_configs = relabelHosts;
           scrape_interval = "1s";
         }
-        { job_name = "promtail";
-          static_configs = [
-            { targets = ["localhost:9080"]; }
-          ];
-          relabel_configs = relabelHosts;
-          scrape_interval = "1s";
-        }
         { job_name = "apcupsd";
           static_configs = [
             { targets = ["localhost:${toString config.services.prometheus.exporters.apcupsd.port}"]; }
diff --git a/installer/default.nix b/installer/default.nix
index 3fd3e655..26f38572 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -8,11 +8,7 @@ with lib;
   ];
 
   config = {
-    boot = {
-      initrd.kernelModules = [ "e1000e" "virtio_net" ];
-      kernelPackages = pkgs.linuxPackages_7_0;
-      zfs.package = pkgs.zfs_unstable;
-    };
+    boot.initrd.kernelModules = [ "e1000e" "virtio_net" ];
 
     hardware.cpu.amd.updateMicrocode = config.hardware.enableRedistributableFirmware;
 
diff --git a/overlays/smartprom/default.nix b/overlays/smartprom/default.nix
index 35e94608..eaeb080d 100644
--- a/overlays/smartprom/default.nix
+++ b/overlays/smartprom/default.nix
@@ -1,23 +1,28 @@
-{ prev, sources, ... }:
+{ prev, final, sources, flakeInputs, ... }:
 {
-  smartprom =
-    with prev.poetry2nix;
-    mkPoetryApplication {
-      inherit (sources.smartprom) pname version;
-      projectDir = cleanPythonSources {
-        src = prev.runCommand "sources" {} ''
-          mkdir $out
-          cp -r ${sources.smartprom.src}/. $out
+  smartprom = let
+    project = flakeInputs.pyproject-nix.lib.project.loadRequirementsTxt {
+      projectRoot = sources.smartprom.src;
+    };
+    python = final.python3;
+  in python.pkgs.buildPythonApplication {
+    pname = "smartprom";
+    version = "2.3.0";
 
-          mkdir $out/smartprom
-          mv $out/megaraid.py $out/smartprom
-          mv $out/smartprom.py $out/smartprom/__main__.py
-          sed -ri 's/import megaraid/from . import megaraid/' $out/smartprom/__main__.py
-          echo >> $out/smartprom/__init__.py
+    src = prev.runCommand "sources" {} ''
+      mkdir $out
+      cp -r ${sources.smartprom.src}/. $out
 
-          cp ${./pyproject.toml} $out/pyproject.toml
-          cp ${./poetry.lock} $out/poetry.lock
-        '';
-      };
-    };
+      mkdir $out/smartprom
+      mv $out/megaraid.py $out/smartprom
+      mv $out/smartprom.py $out/smartprom/__main__.py
+      sed -ri 's/import megaraid/from . import megaraid/' $out/smartprom/__main__.py
+      echo >> $out/smartprom/__init__.py
+
+      cp ${./pyproject.toml} $out/pyproject.toml
+    '';
+
+    pyproject = true;
+    propagatedBuildInputs = (project.renderers.withPackages { inherit python; }) python.pkgs;
+  };
 }
diff --git a/overlays/smartprom/poetry.lock b/overlays/smartprom/poetry.lock
deleted file mode 100644
index de8be1f8..00000000
--- a/overlays/smartprom/poetry.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is automatically @generated by Poetry and should not be changed by hand.
-
-[[package]]
-name = "prometheus-client"
-version = "0.16.0"
-description = "Python client for the Prometheus monitoring system."
-category = "main"
-optional = false
-python-versions = ">=3.6"
-files = [
-    {file = "prometheus_client-0.16.0-py3-none-any.whl", hash = "sha256:0836af6eb2c8f4fed712b2f279f6c0a8bbab29f9f4aa15276b91c7cb0d1616ab"},
-    {file = "prometheus_client-0.16.0.tar.gz", hash = "sha256:a03e35b359f14dd1630898543e2120addfdeacd1a6069c1367ae90fd93ad3f48"},
-]
-
-[package.extras]
-twisted = ["twisted"]
-
-[metadata]
-lock-version = "2.0"
-python-versions = ">=3.10.0,<3.12"
-content-hash = "a84309056a73a8051b1c506324a43036ecfa6e4584882d2ec30ef1d6e030b1a1"
diff --git a/overlays/smartprom/pyproject.toml b/overlays/smartprom/pyproject.toml
index 8ca28f00..620efa1a 100644
--- a/overlays/smartprom/pyproject.toml
+++ b/overlays/smartprom/pyproject.toml
@@ -1,16 +1,12 @@
-[tool.poetry]
+[project]
 name = "smartprom"
 version = "2.3.0"
-authors = []
-description = ""
+dependencies = [
+    "prometheus-client"
+]
 
-[tool.poetry.scripts]
+[project.scripts]
 smartprom = "smartprom.__main__:main"
 
-[tool.poetry.dependencies]
-python = ">=3.10.0,<3.13"
-prometheus-client = "^0.16.0"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
\ No newline at end of file
+[tool.setuptools]
+packages = ["smartprom"]