nix/configurations/vanadium/nixos/gui.nix

@@ -28,7 +28,7 @@
     enable = true;
     hooks = {
       # Reset display setting on login
-      "RUN" = ''
+      "UNBLANK" = ''
         ${lib.getExe pkgs.autorandr} --change --ignore-lid
       '';
     };

nix/homeModules/common/fish/default.nix

@@ -10,7 +10,7 @@
   #
   # Script dependencies
   #
-  home.packages = [pkgs.vivid];
+  home.packages = [pkgs.vivid pkgs.patdiff];
   programs = {
     fd.enable = true;
     fzf.enable = true;

nix/homeModules/common/fish/shellInit.fish

@@ -80,8 +80,7 @@ end
 set -x fzf_preview_file_cmd 'cat -n'
 # fzf-fish search hidden files
 set -x fzf_fd_opts --hidden --exclude=.git
-# fzf-fish using patdiff would show incomplete diff, it is a bug
-# don't do it
+set -x fzf_diff_highlighter patdiff
 
 # fd uses LS_COLORS
 set -x LS_COLORS (vivid -m 24-bit generate solarized-light) # similar to milou

nix/homeModules/common/fzf.nix

@@ -3,8 +3,9 @@
     "--cycle"
     "--border=none"
     "--preview-window=wrap"
-    "--color=fg:#073642,bg:#fdf6e3,hl:#af005f"
-    "--color=fg+:#073642,bg+:#f0e5c9,hl+:#af005f"
+    # TODO: This makes the unmatched harder to read
+    "--color=fg:#a0a1a7,bg:#fdf6e3,hl:#073642"
+    "--color=fg+:#a0a1a7,bg+:#f0e5c9,hl+:#073642"
     "--color=info:#268bd2,prompt:#5f5faf,pointer:#073642"
     "--color=marker:#268bd2,spinner:#5f5faf,header:#073642"
     "--color=gutter:#eeeadd"

nix/packages/by-name/ruler/package.nix

@@ -12,8 +12,8 @@
       domain = "git.confusedcompiler.org";
       owner = "leana8959";
       repo = "ruler";
-      rev = "46f40d303f3b04d65475fdfd6511dd6431f20f24";
-      hash = "sha256-goJ4iYnFqn88y6xEBhaFnos8O1MWIqHzwGrR1W0yijo=";
+      rev = "4c374125ec9f566638e64671f468e598b33730e6";
+      hash = "sha256-n5xNC31t5S+h5WoT6iaJV2JxomxKLqz6gGF0KrM8YjQ=";
     })
     {};