9 files changed, 92 insertions, 83 deletions

diff --git a/_sources/generated.json b/_sources/generated.json
index 03a62620..338b7940 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -22,7 +22,7 @@
     },
     "bpf-examples": {
         "cargoLock": null,
-        "date": "2026-02-19",
+        "date": "2026-04-20",
         "extract": null,
         "name": "bpf-examples",
         "passthru": null,
@@ -34,12 +34,12 @@
             "name": null,
             "owner": "xdp-project",
             "repo": "bpf-examples",
-            "rev": "991e12f843b1ee0a79e33fef91d75e831e6e458d",
-            "sha256": "sha256-NxjDmCO2yADlQjyNlrXVd3Yk/8JnQ1gSqYZ3hUYtn6c=",
+            "rev": "d65196cba041b5c270ec006e32e5c85ff2f87474",
+            "sha256": "sha256-S8hM++d2mKpuRcXOe0/7sTd447KLEtCI9iAJ9eb72l4=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "991e12f843b1ee0a79e33fef91d75e831e6e458d"
+        "version": "d65196cba041b5c270ec006e32e5c85ff2f87474"
     },
     "emacs-scratch_el": {
         "cargoLock": null,
@@ -293,7 +293,7 @@
     },
     "nix-output-monitor": {
         "cargoLock": null,
-        "date": "2026-04-10",
+        "date": "2026-04-17",
         "extract": null,
         "name": "nix-output-monitor",
         "passthru": null,
@@ -303,13 +303,13 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "5683dc2251784e66399889cbdbb193fb8994eae0",
-            "sha256": "sha256-Fc3aftSAKfc+U87QzyDEFHloyLJoCLgJbzYEq9PlxjA=",
+            "rev": "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b",
+            "sha256": "sha256-DARjZPYhim9AGSdDsNL2GUfITCG+QSI+jaYMOYooRmU=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git"
         },
-        "version": "5683dc2251784e66399889cbdbb193fb8994eae0"
+        "version": "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b"
     },
     "postfix-mta-sts-resolver": {
         "cargoLock": null,
@@ -375,7 +375,7 @@
     },
     "quickshell": {
         "cargoLock": null,
-        "date": "2026-04-09",
+        "date": "2026-04-21",
         "extract": null,
         "name": "quickshell",
         "passthru": null,
@@ -385,13 +385,13 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "d4c92973b53d9fa34cc110d3b974eb6bde5b3027",
-            "sha256": "sha256-p+vqkCuFfVNyQBo370wr6MebNUvz55RZiC0m8YKUhvQ=",
+            "rev": "d60498adc038526b3d155e8ad61e51e78e6e32eb",
+            "sha256": "sha256-0CTVYyznIl8QC6PpMoOSM2Qo4sIdHp3j3wV8lU7wON8=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://git.outfoxxed.me/quickshell/quickshell.git"
         },
-        "version": "d4c92973b53d9fa34cc110d3b974eb6bde5b3027"
+        "version": "d60498adc038526b3d155e8ad61e51e78e6e32eb"
     },
     "scutiger": {
         "cargoLock": null,
@@ -457,7 +457,7 @@
     },
     "v4l2loopback": {
         "cargoLock": null,
-        "date": "2026-03-29",
+        "date": "2026-04-16",
         "extract": null,
         "name": "v4l2loopback",
         "passthru": null,
@@ -469,12 +469,12 @@
             "name": null,
             "owner": "umlaeute",
             "repo": "v4l2loopback",
-            "rev": "3c7ad2d665b0f511afb6a27f0370098f5ad11b32",
-            "sha256": "sha256-p70o64VC5UoQUVE4pfhSu6fSk7KfDl6AUSOHFfeOse0=",
+            "rev": "94d18a57aea281559ccfb31f99325f822fa8ab4a",
+            "sha256": "sha256-CqcGkEOHS4+7LBO+CoVX8E/c/kUy2uuEGUdN5/vMSFk=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "3c7ad2d665b0f511afb6a27f0370098f5ad11b32"
+        "version": "94d18a57aea281559ccfb31f99325f822fa8ab4a"
     },
     "xcompose": {
         "cargoLock": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index efa9ee79..2015ea85 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -23,15 +23,15 @@
   };
   bpf-examples = {
     pname = "bpf-examples";
-    version = "991e12f843b1ee0a79e33fef91d75e831e6e458d";
+    version = "d65196cba041b5c270ec006e32e5c85ff2f87474";
     src = fetchFromGitHub {
       owner = "xdp-project";
       repo = "bpf-examples";
-      rev = "991e12f843b1ee0a79e33fef91d75e831e6e458d";
+      rev = "d65196cba041b5c270ec006e32e5c85ff2f87474";
       fetchSubmodules = true;
-      sha256 = "sha256-NxjDmCO2yADlQjyNlrXVd3Yk/8JnQ1gSqYZ3hUYtn6c=";
+      sha256 = "sha256-S8hM++d2mKpuRcXOe0/7sTd447KLEtCI9iAJ9eb72l4=";
     };
-    date = "2026-02-19";
+    date = "2026-04-20";
   };
   emacs-scratch_el = {
     pname = "emacs-scratch_el";
@@ -185,17 +185,17 @@
   };
   nix-output-monitor = {
     pname = "nix-output-monitor";
-    version = "5683dc2251784e66399889cbdbb193fb8994eae0";
+    version = "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b";
     src = fetchgit {
       url = "https://code.maralorn.de/maralorn/nix-output-monitor.git";
-      rev = "5683dc2251784e66399889cbdbb193fb8994eae0";
+      rev = "2e5180152e621ad7e0c0b66ccaa81c82ceab7f2b";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
       sparseCheckout = [ ];
-      sha256 = "sha256-Fc3aftSAKfc+U87QzyDEFHloyLJoCLgJbzYEq9PlxjA=";
+      sha256 = "sha256-DARjZPYhim9AGSdDsNL2GUfITCG+QSI+jaYMOYooRmU=";
     };
-    date = "2026-04-10";
+    date = "2026-04-17";
   };
   postfix-mta-sts-resolver = {
     pname = "postfix-mta-sts-resolver";
@@ -237,17 +237,17 @@
   };
   quickshell = {
     pname = "quickshell";
-    version = "d4c92973b53d9fa34cc110d3b974eb6bde5b3027";
+    version = "d60498adc038526b3d155e8ad61e51e78e6e32eb";
     src = fetchgit {
       url = "https://git.outfoxxed.me/quickshell/quickshell.git";
-      rev = "d4c92973b53d9fa34cc110d3b974eb6bde5b3027";
+      rev = "d60498adc038526b3d155e8ad61e51e78e6e32eb";
       fetchSubmodules = false;
       deepClone = false;
       leaveDotGit = false;
       sparseCheckout = [ ];
-      sha256 = "sha256-p+vqkCuFfVNyQBo370wr6MebNUvz55RZiC0m8YKUhvQ=";
+      sha256 = "sha256-0CTVYyznIl8QC6PpMoOSM2Qo4sIdHp3j3wV8lU7wON8=";
     };
-    date = "2026-04-09";
+    date = "2026-04-21";
   };
   scutiger = {
     pname = "scutiger";
@@ -289,15 +289,15 @@
   };
   v4l2loopback = {
     pname = "v4l2loopback";
-    version = "3c7ad2d665b0f511afb6a27f0370098f5ad11b32";
+    version = "94d18a57aea281559ccfb31f99325f822fa8ab4a";
     src = fetchFromGitHub {
       owner = "umlaeute";
       repo = "v4l2loopback";
-      rev = "3c7ad2d665b0f511afb6a27f0370098f5ad11b32";
+      rev = "94d18a57aea281559ccfb31f99325f822fa8ab4a";
       fetchSubmodules = true;
-      sha256 = "sha256-p70o64VC5UoQUVE4pfhSu6fSk7KfDl6AUSOHFfeOse0=";
+      sha256 = "sha256-CqcGkEOHS4+7LBO+CoVX8E/c/kUy2uuEGUdN5/vMSFk=";
     };
-    date = "2026-03-29";
+    date = "2026-04-16";
   };
   xcompose = {
     pname = "xcompose";
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index f88375ce..2ed8b9ef 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -49,11 +49,8 @@ let
     ];
   };
 
-  # lockCommand = "${lib.getExe' config.systemd.package "systemctl"} --user start gtklock.service";
-  lockCommand = "${lib.getExe' cfg.programs.quickshell.package "qs"} ipc call Lockscreen setLocked true";
-
   editor = pkgs.symlinkJoin {
-    inherit (cfg.services.emacs.package) name;
+    name = "${cfg.services.emacs.package.name}-editor";
     buildInputs = with pkgs; [ makeWrapper ];
     paths = [ cfg.services.emacs.package ];
     postBuild = ''
@@ -475,6 +472,8 @@ in {
         };
 
         poweralertd.enable = true;
+
+        gnome-keyring.enable = lib.mkForce false;
       };
 
       home.pointerCursor = {
diff --git a/accounts/gkleen@sif/niri.nix b/accounts/gkleen@sif/niri.nix
index 3b60e033..1ee6bec9 100644
--- a/accounts/gkleen@sif/niri.nix
+++ b/accounts/gkleen@sif/niri.nix
@@ -1,4 +1,4 @@
-{ config, hostConfig, pkgs, lib, flakeInputs, ... }:
+{ config, hostConfig, pkgs, lib, utils, flakeInputs, ... }:
 let
   cfg = config.programs.niri;
 
@@ -7,7 +7,23 @@ let
 
   niri = cfg.package;
   spawnTerminal = { command ? lib.getExe config.programs.zsh.package, extraArgs ? [] }:
-    [(lib.getExe config.programs.alacritty.package) "msg" "--socket" "/run/user/1000/alacritty.sock" "create-window"] ++ lib.toList extraArgs ++ ["--command" (lib.getExe' hostConfig.systemd.package "systemd-run") "--user" "--pty" "--same-dir" "--wait" "--collect" "--quiet" "--service-type=exec" "--expand-environment=no"] ++ lib.toList command;
+    [(lib.getExe config.programs.alacritty.package) "msg" "--socket" "/run/user/1000/alacritty.sock" "create-window"] ++ lib.toList extraArgs ++ ["--command" (lib.getExe' hostConfig.systemd.package "systemd-run") "--user" "--pty" "--same-dir" "--wait" "--collect" "--quiet" "--service-type=exec" "--expand-environment=no"] ++ lib.mapAttrsToList (k: v: "--property=Environment=${utils.escapeSystemdExecArg "${k}=${if v == null then "" else v}"}") execEnvironment ++ lib.toList command;
+
+  execEnvironment = {
+    NIXOS_OZONE_WL = "1";
+    QT_QPA_PLATFORM = "wayland";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    GDK_BACKEND = "wayland";
+    SDL_VIDEODRIVER = "wayland";
+    DISPLAY = ":0";
+    ELECTRON_OZONE_PLATFORM_HINT = "auto";
+    SSH_ASKPASS_REQUIRE = "prefer";
+    SSH_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
+    SUDO_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
+    GTK_IM_MODULE = null;
+    QT_IM_MODULE = null;
+    QT_IM_MODULES = null;
+  };
 
   focus_or_spawn = pkgs.writeShellApplication {
     name = "focus-or-spawn";
@@ -507,21 +523,7 @@ in {
             (plain "hot-corners" [(flag "off")])
           ])
 
-          (plain "environment" (lib.mapAttrsToList sleaf {
-            NIXOS_OZONE_WL = "1";
-            QT_QPA_PLATFORM = "wayland";
-            QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-            GDK_BACKEND = "wayland";
-            SDL_VIDEODRIVER = "wayland";
-            DISPLAY = ":0";
-            ELECTRON_OZONE_PLATFORM_HINT = "auto";
-            SSH_ASKPASS_REQUIRE = "prefer";
-            SSH_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
-            SUDO_ASKPASS = lib.getExe pkgs.kdePackages.ksshaskpass;
-            GTK_IM_MODULE = null;
-            QT_IM_MODULE = null;
-            QT_IM_MODULES = null;
-          }))
+          (plain "environment" (lib.mapAttrsToList sleaf execEnvironment))
 
           (node "output" ["eDP-1"] [
             (sleaf "scale" 1.5)
diff --git a/flake.lock b/flake.lock
index 35735283..c3b2c230 100644
--- a/flake.lock
+++ b/flake.lock
@@ -611,11 +611,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1775877135,
-        "narHash": "sha256-nAqtUMy22olwyiOJB0CASVrbu5XB5+43GjlbIJ1KuvQ=",
+        "lastModified": 1776791170,
+        "narHash": "sha256-mf9M2WgY+DnQ0EbpLDTguBfKo9pegSD3VpU4aR6hOnE=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "f943da038fd668d435c2d17916577f295faa8839",
+        "rev": "bcc58e672eea56892ebba58671e37dca00b701fc",
         "type": "github"
       },
       "original": {
@@ -687,11 +687,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775970782,
-        "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
+        "lastModified": 1776575850,
+        "narHash": "sha256-28Gqz0GDpGsBv8GtAn2dywEQRr+CtTDsD5J7VD6icBE=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "bedba5989b04614fc598af9633033b95a937933f",
+        "rev": "3b9653a107c736222b5ae0d4036dd3b885219065",
         "type": "github"
       },
       "original": {
@@ -869,11 +869,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1775811116,
-        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
+        "lastModified": 1776434932,
+        "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
+        "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
         "type": "github"
       },
       "original": {
@@ -949,11 +949,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1776093572,
-        "narHash": "sha256-M+RtZ9KeJNffBBxcAvDn01bU2D5t/yZSzDyI0BtfLGE=",
-        "owner": "nixos",
+        "lastModified": 1776548001,
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83363c6282634723c164327f92d1537175509ad5",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
         "type": "github"
       },
       "original": {
@@ -1222,11 +1222,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773870109,
-        "narHash": "sha256-ZoTdqZP03DcdoyxvpFHCAek4bkPUTUPUF3oCCgc3dP4=",
+        "lastModified": 1776659114,
+        "narHash": "sha256-qapCOQmR++yZSY43dzrp3wCrkOTLpod+ONtJWBk6iKU=",
         "owner": "pyproject-nix",
         "repo": "build-system-pkgs",
-        "rev": "b6e74f433b02fa4b8a7965ee24680f4867e2926f",
+        "rev": "ffaa2161dd5d63e0e94591f86b54fc239660fb2e",
         "type": "github"
       },
       "original": {
@@ -1242,11 +1242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775439158,
-        "narHash": "sha256-NHY9SJNU019n+8NCabBDtmuzRFeE2gZlYKHowp9bV24=",
+        "lastModified": 1776715674,
+        "narHash": "sha256-Gs1VnEkCkkRZxJQAC/Dhz0Jbfi22mFXChbtNg9w/Ybg=",
         "owner": "pyproject-nix",
         "repo": "pyproject.nix",
-        "rev": "fb6b728260f3f32761367e9fd1e1a25b4245bcd0",
+        "rev": "69f57f27e52a87c54e28138a75ec741cd46663c9",
         "type": "github"
       },
       "original": {
@@ -1315,11 +1315,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775971308,
-        "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
+        "lastModified": 1776771786,
+        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
+        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
         "type": "github"
       },
       "original": {
@@ -1390,11 +1390,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775706324,
-        "narHash": "sha256-BTb4sydzX2B5/oNbvCdQFeSbk97xEnbb8bk84CiKCOs=",
+        "lastModified": 1776718528,
+        "narHash": "sha256-XeGmo/BhkFXd8vVyendr3X4mQmw7CEkeQcpy7AHbVcg=",
         "owner": "pyproject-nix",
         "repo": "uv2nix",
-        "rev": "5707df99097375896a3dda811d492a2fabe63500",
+        "rev": "60982c30e16db3e0cba6c0ed13f0894b06ab2bf1",
         "type": "github"
       },
       "original": {
diff --git a/hosts/eostre/default.nix b/hosts/eostre/default.nix
index d4113024..f8b48665 100644
--- a/hosts/eostre/default.nix
+++ b/hosts/eostre/default.nix
@@ -13,6 +13,13 @@ with lib;
       externalConfig = {
         allowUnfree = true;
       };
+      extraOverlays = [
+        (final: prev: {
+          upower = prev.upower.overrideAttrs (oldAttrs: {
+            doCheck = false;
+          });
+        })
+      ];
     };
 
     boot = {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 7d482218..498e12b6 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -666,6 +666,8 @@ in {
       timezone = true;
     };
 
+    services.gnome.gnome-keyring.enable = lib.mkForce false;
+
     security.pam.services.quickshell = {};
 
     home-manager.sharedModules = [ flakeInputs.nixVirt.homeModules.default ];
diff --git a/hosts/vidhar/network/pppoe/default.nix b/hosts/vidhar/network/pppoe/default.nix
index 8078de4c..f652c29d 100644
--- a/hosts/vidhar/network/pppoe/default.nix
+++ b/hosts/vidhar/network/pppoe/default.nix
@@ -23,9 +23,9 @@ in {
     services.pppd = {
       enable = true;
       package = pkgs.ppp.overrideAttrs (oldAttrs: {
-        patches = (oldAttrs.patches or []) ++ [
+        patches = [
           ./no-double-timeout.patch
-        ];
+        ] ++ (oldAttrs.patches or []);
       });
       peers = {
         o2.config = ''
@@ -74,7 +74,6 @@ in {
         +ipv6
       '';
       "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" {
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index 58d2fe7c..43369f50 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -1,4 +1,4 @@
-{ flake, flakeInputs, home-manager, path, hostName, config, options, lib, pkgs, customUtils, ... }:
+{ flake, flakeInputs, home-manager, path, hostName, config, options, lib, pkgs, utils, customUtils, ... }:
 
 with lib;
 
@@ -162,7 +162,7 @@ in {
             systemd.user.startServices = "sd-switch";
           }
         ];
-        extraSpecialArgs = { inherit flake flakeInputs path; hostConfig = config; };
+        extraSpecialArgs = { inherit flake flakeInputs path utils customUtils; hostConfig = config; };
       };
 
       sops = mkIf hasSops {