...flakes

10 files changed, 117 insertions, 23 deletions

diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix
index 5bb41677..610fa551 100644
--- a/accounts/gkleen@skadhi/default.nix
+++ b/accounts/gkleen@skadhi/default.nix
@@ -77,6 +77,7 @@ in {
           ".local/share/etesync-dav"
           (lib.removePrefix (config.home.homeDirectory + "/") config.services.unison.pairs."documents".stateDirectory)
           ".aqbanking"
+          ".gnupg"
         ];
       };
 
@@ -317,6 +318,14 @@ in {
       };
 
       programs.libreoffice.enable = true;
+
+      programs.imv.enable = true;
+
+      sops.secrets."nixpkgs-pr-watch.toml" = {
+        format = "binary";
+        sopsFile = ./nixpkgs-pr-watch.toml;
+        path = ".config/nixpkgs-pr-watch.toml";
+      };
     };
   };
 }
diff --git a/accounts/gkleen@skadhi/firefox/userChrome.css b/accounts/gkleen@skadhi/firefox/userChrome.css
index 726f1e4b..d137f4bf 100644
--- a/accounts/gkleen@skadhi/firefox/userChrome.css
+++ b/accounts/gkleen@skadhi/firefox/userChrome.css
@@ -52,3 +52,44 @@ hbox:has(> #tabs-newtab-button) {
 #sidebar-main .tools-and-extensions {
     justify-content: space-around !important;
 }
+
+/* /\* Nova tabs (horizontal + vertical): no outline, less rounding *\/ */
+/* .tabbrowser-tab { */
+/*   --tab-selected-outline-color: transparent !important; */
+/*   --tab-border-radius: 4px !important; */
+/* } */
+/* .tab-background, */
+/* .tab-background:is([selected], [multiselected]) { */
+/*   outline: none !important; */
+/*   border: none !important; */
+/*   box-shadow: none !important; */
+/*   border-radius: 4px !important; */
+/*   position: relative !important; */
+/* } */
+
+/* Container indicator, shared */
+.tab-context-line {
+  position: absolute !important;
+  margin: 0 !important;
+  background-color: var(--identity-tab-color) !important;
+}
+
+/* Horizontal tabs: flat line across the top of the tab */
+#tabbrowser-tabs:not([orient="vertical"]) .tab-context-line {
+  inset-block-start: 0 !important;
+  inset-block-end: auto !important;
+  inset-inline: 0 !important;
+  width: auto !important;
+  height: 2px !important;
+  border-radius: 4px 4px 0 0 !important;
+}
+
+/* Vertical tabs: bar on the right edge */
+#tabbrowser-tabs[orient="vertical"] .tab-context-line {
+  inset-block: 4px !important;
+  inset-inline-start: auto !important;
+  inset-inline-end: 0 !important;
+  width: 3px !important;
+  height: auto !important;
+  border-radius: 2px !important;
+}
diff --git a/accounts/gkleen@skadhi/keepassxc.nix b/accounts/gkleen@skadhi/keepassxc.nix
index 8cb781b8..4b83e103 100644
--- a/accounts/gkleen@skadhi/keepassxc.nix
+++ b/accounts/gkleen@skadhi/keepassxc.nix
@@ -25,9 +25,6 @@
         directories = [
           ".config/keepassxc" ".local/state/keepassxc"
         ];
-        files = [
-          "store.kdbx"
-        ];
       };
 
       services.gnome-keyring.enable = lib.mkForce false;
diff --git a/accounts/gkleen@skadhi/niri.nix b/accounts/gkleen@skadhi/niri.nix
index beb3ef4e..2854d434 100644
--- a/accounts/gkleen@skadhi/niri.nix
+++ b/accounts/gkleen@skadhi/niri.nix
@@ -238,7 +238,10 @@ in {
   };
 
   config = {
-    home.packages = [ pkgs.xwayland-satellite-unstable ];
+    systemd.user.tmpfiles.rules = [
+      "e ${config.home.homeDirectory}/screenshots - - - 365d -"
+      "d ${config.home.homeDirectory}/.cache/qalc-fuzzel - - - 1d -"
+    ];
 
     systemd.user.sockets.niri-workspace-history = {
       Socket = {
@@ -482,6 +485,10 @@ in {
         normalize-nodes = nodes: lib.remove null (lib.flatten nodes);
       in
         normalize-nodes [
+          (plain "xwayland-satellite" [
+            (sleaf "path" (toString (lib.getExe pkgs.xwayland-satellite-unstable)))
+          ])
+
           (flag "prefer-no-csd")
 
           (sleaf "screenshot-path" "~/screenshots/%Y-%m-%dT%H:%M:%S.png")
diff --git a/accounts/gkleen@skadhi/nixpkgs-pr-watch.toml b/accounts/gkleen@skadhi/nixpkgs-pr-watch.toml
new file mode 100644
index 00000000..ffec830b
--- /dev/null
+++ b/accounts/gkleen@skadhi/nixpkgs-pr-watch.toml
@@ -0,0 +1,18 @@
+{
+        "data": "ENC[AES256_GCM,data:649YKXrQh9Y9b7cNMJQYxLGN1W2aRCmFZJgNiHtvErsxhVf/OpEcwkKGxwd94H5Ytp3AhFVqvahdE1jFRtVlGLYNjOJedT4BdXR6iIQPpoUEDm2uTyM3+d1lg5jhIlw=,iv:xeANg/1tlJFam75+dVUyvK6pcWTx5q/V0LwuUJW7Ov0=,tag:cf10y5q1vi+Ct1yIVg4MSQ==,type:str]",
+        "sops": {
+                "age": [
+                        {
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVnp4Z0lnNU9PQkRxaGtu\nODRzRUNValUra2hJQTN2RGUvTGlVVU55UUZjCll0VjZQUnpueVBYNEdEeTFwWllC\nOGk3QmFNeUhZZjVnN1I1UjBxdEo4d3cKLS0tIFI1bHdicTNFVXJqbStTb1E4TkdK\nUXlyRThQM2MvNWJOTTI1Q1ZTb2kweE0KPDzcJ4HAeQR5LmdrB8A67aorVtfeVSE7\nIAJ4NaABgshot2yy3UdKyX17iel86TEM1IqZkhkvTl7dZbRjj9k2Nw==\n-----END AGE ENCRYPTED FILE-----\n",
+                                "recipient": "age1rmmhetcmllq0ahl5qznlr0eya2zdxwl9h6y5wnl97d2wtyx5t99sm2u866"
+                        },
+                        {
+                                "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvck1HSjJxQ0dUekl6emh1\nd3dqa2s5ci9xRUdyZFlnblM0OGVHK2hUSzFJCllzdVhKbVQ3R2xpSURJaFF3dzZ6\nZVRqMzF0ZEpIS2prZjY4bG9ubm1hL0kKLS0tIHJMWUVXSWlrR2lRdHI0SFZkc1Yy\nTUhXWDRBYzlRaTNiQ3JFQzkyS2QzMTAK+D4Ul9s8AizzI0B+F/B3IuqovSZQhzqW\nzAnLKXpMZlxUiUc/+j8t8eQ+IPb0rHpvZs6IHkSb7QKmdKTJzFaKVg==\n-----END AGE ENCRYPTED FILE-----\n",
+                                "recipient": "age1u6xegt79rarmyz8qy4pl7jh9lh90vx8fg0frmh4u2mzam7zydq4s4agz4e"
+                        }
+                ],
+                "lastmodified": "2026-10-28T08:55:58Z",
+                "mac": "ENC[AES256_GCM,data:2oYVn8EMn31N07ywc8MWrw0KyGIi/rEmRV6WsX3S+aYy3TAp9VvxbWRSNU1fmhMA/DEm/CwcL8fJQGfhwF4V3X4WMBKwFcxznYm0+weNZuECP1EfpfFLVtaQ7CqH7UAGdsj1F0QTI8AJ8Z2YRT3ICuNyMMnNizmgph4zagi3z0A=,iv:aD/6IVUc2C0V1GiQjBnjoep5q4RgJAhjc5j3gBz6vRc=,tag:8qaWLFG0qB68Dgi4kZTmIg==,type:str]",
+                "version": "3.13.3"
+        }
+}
diff --git a/accounts/gkleen@skadhi/rzm/default.nix b/accounts/gkleen@skadhi/rzm/default.nix
index 124fcc32..2ca9b68c 100644
--- a/accounts/gkleen@skadhi/rzm/default.nix
+++ b/accounts/gkleen@skadhi/rzm/default.nix
@@ -99,9 +99,6 @@ in {
 
     home-manager.users.gkleen = { sysConfig, config, lib, ... }: {
       home.persistence."/persistent" = {
-        files = [
-          "rz.kdbx"
-        ];
         directories = [
           ".config/Element-lmu" ".config/worktime"
           ".config/chromium-kimai" ".config/chromium-rainbow"
diff --git a/lib/pythonSet.nix b/lib/pythonSet.nix
index 98315718..280161c2 100644
--- a/lib/pythonSet.nix
+++ b/lib/pythonSet.nix
@@ -11,38 +11,33 @@
         sdnotify = (prev.sdnotify.override {
           sourcePreference = "sdist";
         }).overrideAttrs (oldAttrs: {
-          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
-            (final.resolveBuildSystem { setuptools = []; })
-          ];
+          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++
+            final.resolveBuildSystem { setuptools = []; };
         });
         systemd-python = (prev.systemd-python.override {
           sourcePreference = "sdist";
         }).overrideAttrs (oldAttrs: {
           nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
             pkgs.pkg-config pkgs.systemd.dev
-            (final.resolveBuildSystem { setuptools = []; })
-          ];
+          ] ++ final.resolveBuildSystem { setuptools = []; };
         });
         halo = (prev.halo.override {
           sourcePreference = "sdist";
         }).overrideAttrs (oldAttrs: {
-          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
-            (final.resolveBuildSystem { setuptools = []; })
-          ];
+          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++
+            final.resolveBuildSystem { setuptools = []; };
         });
         unshare = (prev.unshare.override {
           sourcePreference = "sdist";
         }).overrideAttrs (oldAttrs: {
-          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
-            (final.resolveBuildSystem { setuptools = []; })
-          ];
+          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++
+            final.resolveBuildSystem { setuptools = []; };
         });
         pyyaml = (prev.pyyaml.override {
           sourcePreference = "sdist";
         }).overrideAttrs (oldAttrs: {
-          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [
-            (final.resolveBuildSystem { setuptools = []; })
-          ];
+          nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++
+            final.resolveBuildSystem { setuptools = []; };
         });
       })
     ]
diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix
index 64f30071..7ed1a5ee 100644
--- a/overlays/etesync-dav.nix
+++ b/overlays/etesync-dav.nix
@@ -32,7 +32,35 @@
       flask-wtf
       msgpack
       requests
-      (toPythonModule (final.radicale.override { python3 = python; }))
+      (buildPythonApplication rec {
+        pname = "radicale";
+        version = "3.2.0";
+        pyproject = true;
+
+        src = prev.fetchFromGitHub {
+          owner = "Kozea";
+          repo = "Radicale";
+          rev = "refs/tags/v${version}";
+          hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";
+        };
+
+        postPatch = ''
+          sed -i '/addopts/d' setup.cfg
+        '';
+
+        build-system = [
+          setuptools
+        ];
+
+        dependencies = [
+          defusedxml
+          passlib
+          vobject
+          pika
+          python-dateutil
+          pytz # https://github.com/Kozea/Radicale/issues/816
+        ] ++ passlib.optional-dependencies.bcrypt;
+      })
     ] ++ requests.optional-dependencies.socks;
 
     doCheck = false;
diff --git a/overlays/lesspipe.nix b/overlays/lesspipe.nix
index b791f6e5..fdcd2582 100644
--- a/overlays/lesspipe.nix
+++ b/overlays/lesspipe.nix
@@ -17,7 +17,7 @@
 
     preFixup = ''
       wrapProgram $out/bin/lesspipe.sh \
-        --prefix PATH : ${prev.lib.makeBinPath (with final; [ file ncurses binutils ])}
+        --prefix PATH : ${prev.lib.makeBinPath (with final; [ csvkit file ncurses binutils ])}
     '';
   };
 }
diff --git a/user-profiles/utils.nix b/user-profiles/utils.nix
index eea68f84..1b4a5c4b 100644
--- a/user-profiles/utils.nix
+++ b/user-profiles/utils.nix
@@ -48,6 +48,8 @@ in {
       man.enable = true;
 
       vim.enable = true;
+
+      fd.enable = true;
     };
 
     home.sessionVariables = {