configuration/gpg-ssh/default.nix

@@ -1,17 +1,7 @@
 { pkgs, lib, ... }:
 
-let
+{
 
-  custom_gnupg = pkgs.gnupg.overrideAttrs (final: prev: {
-    configureFlags = prev.configureFlags ++ [
-      # Make sure scdaemon never ever again tries to use its own ccid driver
-      "--disable-ccid-driver"
-    ];
-  });
-
-in {
-
-  programs.gnupg.package = custom_gnupg;
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
@@ -19,7 +9,7 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
-    custom_gnupg
+    gnupg
     yubikey-personalization
     openpgp-card-tools
 

flake.lock

@@ -288,11 +288,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1729413321,
+        "lastModified": 1729256560,
-        "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
         "type": "github"
       },
       "original": {

hosts/carbon/wg-clerie.nix

@@ -5,6 +5,5 @@
     enable = true;
     ipv6s = [ "2a01:4f8:c0c:15f1::8111/128" ];
     ipv4s = [ "10.20.30.111/32" ];
-    defaultViaVPN = false;
   };
 }

hosts/monitoring-3/prometheus.nix

@@ -190,7 +190,6 @@ in {
               "www.fem.tu-ilmenau.de"
               "www.heise.de"
               "dyon.net.entr0py.de"
-              "matrix.fachschaften.org"
             ];
           }
         ];
@@ -242,7 +241,6 @@ in {
               "matrix.bau-ha.us"
               "dyon.net.entr0py.de"
               "matrix.entr0py.de"
-              "matrix.fachschaften.org"
             ];
           }
         ];
@@ -277,7 +275,6 @@ in {
           {
             targets = [
               "matrix.entr0py.de"
-              "matrix.fachschaften.org"
             ];
           }
         ];

modules/wg-clerie/default.nix

@@ -25,11 +25,6 @@ in
         default = [];
         description = "IPv4 interface addresses";
       };
-      defaultViaVPN = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Use VPN default route for a protocol, if that protocol is unavailable in the underlay";
-      };
     };
   };
 
@@ -50,9 +45,7 @@ in
         { rule = "to 2a01:4f8:c0c:15f1::1/128 ipproto udp dport 51820 unreachable"; prio = 20001; }
         # Try direct routing first, fallback to VPN
         { rule = "lookup main"; prio = 21000; }
-      ] ++ (if cfg.defaultViaVPN then [
         { rule = "lookup wg-clerie"; prio = 21001; }
-      ] else []) ++ [
         { rule = "unreachable"; prio = 22000; }
       ];
       rules4 = (concatMap (ip: [
@@ -64,9 +57,7 @@ in
         { rule = "to 78.47.183.82/32 ipproto udp dport 51820 unreachable"; prio = 20001; }
         # Try direct routing first, fallback to VPN
         { rule = "lookup main"; prio = 21000; }
-      ] ++ (if cfg.defaultViaVPN then [
         { rule = "lookup wg-clerie"; prio = 21001; }
-      ] else []) ++ [
         { rule = "unreachable"; prio = 22000; }
       ];
     };