Removed kanshi from nate-work system, fixed spam assassin failing tests,

flake.lock

@@ -200,11 +200,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776067740,
+        "lastModified": 1776734388,
-        "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=",
+        "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f",
+        "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1775710090,
+        "lastModified": 1776548001,
-        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
+        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
+        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
         "type": "github"
       },
       "original": {

hosts/frame12/default.nix

@@ -92,7 +92,6 @@ in
   environment.systemPackages = with pkgs; [
     cryptsetup
     cage
-    kanshi
     man-pages
     man-pages-posix
     pavucontrol

hosts/nate-work/default.nix

@@ -160,7 +160,6 @@ in
   environment.systemPackages = with pkgs; [
     foot
     nbfc-linux
-    kanshi
     man-pages
     man-pages-posix
     pavucontrol

hosts/nate-work/linked-dotfiles/hypr/hyprland.conf

@@ -99,8 +99,6 @@ opengl {
     nvidia_anti_flicker = 0
 }
 
-# Monitor configuration handled by kanshi
-
 # Window rules
 windowrulev2 = float, class:^(org.keepassxc.KeePassXC)$
 windowrulev2 = workspace special:scratch silent, class:^(org.keepassxc.KeePassXC)$

hosts/nate-work/linked-dotfiles/niri/config.kdl

@@ -26,7 +26,8 @@ debug {
 // OUTPUTS
 // 
 output "eDP-1" {
-    mode "2560x1600@165.019"
+    // enabled true
+    mode "2560x1600"
     scale 1.0
 }
 

shared/modules/apps/helix.nix

@@ -186,11 +186,14 @@ in
 
           space = {
             B = ":sh git log -n 5 --format='format:%%h (%%an: %%ar) %%s' --no-patch -L%{cursor_line},+1:%{buffer_name}";
-            x = ":write-buffer-close";
+            x = ":buffer-close";
             X = ":write-quit-all";
             o = ":config-open";
             h = "hover";
             k = "select_references_to_symbol_under_cursor";
+            # Copy a permalink to the current line in the remote git viewer
+            # (GitHub/GitLab use /blob/<sha>/, Gitea/Codeberg use /src/commit/<sha>/).
+            "@" = ":sh f=%{buffer_name}; l=%{cursor_line}; d=$(dirname \"$f\"); url=$(git -C \"$d\" config --get remote.origin.url) || { echo \"not a git repo or no origin remote\" >&2; exit 1; }; [ -n \"$url\" ] || { echo \"no origin remote\" >&2; exit 1; }; sha=$(git -C \"$d\" rev-parse HEAD) || exit 1; rel=$(git -C \"$d\" ls-files --full-name --error-unmatch -- \"$f\" 2>&1) || { echo \"file not tracked: $rel\" >&2; exit 1; }; command -v wl-copy >/dev/null || { echo \"wl-copy not installed\" >&2; exit 1; }; url=\${url%%.git}; case \"$url\" in git@*) host=\${url#git@}; host=\${host%%:*}; path=\${url#*:}; url=\"https://$host/$path\" ;; esac; case \"$url\" in *github.com*|*gitlab.com*) link=\"$url/blob/$sha/$rel#L$l\" ;; *) link=\"$url/src/commit/$sha/$rel#L$l\" ;; esac; printf '%%s' \"$link\" | wl-copy";
           };
 
           g = {
@@ -199,7 +202,7 @@ in
             n = [ "collapse_selection" "extend_to_line_start" ];
             o = [ "collapse_selection" "extend_to_line_end" ];
             e = "move_line_up";
-            i = "move_line_down";
+            i = "goto_implementation";
             l = "goto_last_line";
             p = "no_op";
             k = "no_op";

shared/modules/system/noctalia-system.nix

@@ -4,10 +4,10 @@ with lib;
 
 let
   cfg = config.noctaliaSystem;
-  unstable = import inputs.nixpkgs-unstable {
+  # unstable = import inputs.nixpkgs-unstable {
-    system = "x86_64-linux";
+  #   system = "x86_64-linux";
-    config.allowUnfree = true;
+  #   config.allowUnfree = true;
-  };
+  # };
 in
 {
   # Import Noctalia's NixOS module for systemd service
@@ -38,9 +38,22 @@ in
     # Required system services for Noctalia features
     # Evolution data server and Evolution - for calendar events support in Noctalia
     services.gnome.evolution-data-server.enable = mkDefault true;
-    # TODO)) switched to unstable instead of pkgs.evolution due to spam swarm build error Apr 14, 2026
+    environment.systemPackages = [ pkgs.evolution ];
-    # Can be changed back at some point to stable.
+
-    environment.systemPackages = [ unstable.evolution ];
+    # Workaround for intermittent spamassassin test failure pulled in by evolution.
+    # The t/spamd_ssl.t test is racy/flaky upstream; the package already excludes
+    # spamd_ssl_accept_fail.t for the same reason. See:
+    # https://github.com/NixOS/nixpkgs/issues/401737
+    # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8068
+    nixpkgs.overlays = [
+      (final: prev: {
+        spamassassin = prev.spamassassin.overrideAttrs (old: {
+          preCheck = (old.preCheck or "") + ''
+            checkFlagsArray+=(TEST_FILES='$(shell find t -name *.t -not -name spamd_ssl_accept_fail.t -not -name spamd_ssl.t)')
+          '';
+        });
+      })
+    ];
 
     # NetworkManager - for wifi widget
     networking.networkmanager.enable = mkDefault true;