From 9cace50bb1a0d9769a7b8bffe86f883bc96c2a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 28 Oct 2025 16:42:53 +0800 Subject: [PATCH 1/4] fzf: make more readable --- nix/homeModules/common/fzf.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nix/homeModules/common/fzf.nix b/nix/homeModules/common/fzf.nix index 6a62bea8..70e94458 100644 --- a/nix/homeModules/common/fzf.nix +++ b/nix/homeModules/common/fzf.nix @@ -3,9 +3,8 @@ "--cycle" "--border=none" "--preview-window=wrap" - # TODO: This makes the unmatched harder to read - "--color=fg:#a0a1a7,bg:#fdf6e3,hl:#073642" - "--color=fg+:#a0a1a7,bg+:#f0e5c9,hl+:#073642" + "--color=fg:#073642,bg:#fdf6e3,hl:#af005f" + "--color=fg+:#073642,bg+:#f0e5c9,hl+:#af005f" "--color=info:#268bd2,prompt:#5f5faf,pointer:#073642" "--color=marker:#268bd2,spinner:#5f5faf,header:#073642" "--color=gutter:#eeeadd" From 1af4390d0579f2fa5915f7f75cbe32ed7239aa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 29 Oct 2025 19:15:56 +0800 Subject: [PATCH 2/4] vanadium/display: fix xscreensaver hook event for autorandr It would run autorandr on the wrong event --- nix/configurations/vanadium/nixos/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/configurations/vanadium/nixos/gui.nix b/nix/configurations/vanadium/nixos/gui.nix index b96b9a65..2bf33ca7 100644 --- a/nix/configurations/vanadium/nixos/gui.nix +++ b/nix/configurations/vanadium/nixos/gui.nix @@ -28,7 +28,7 @@ enable = true; hooks = { # Reset display setting on login - "UNBLANK" = '' + "RUN" = '' ${lib.getExe pkgs.autorandr} --change --ignore-lid ''; }; From ffb056837ce4cbb5a4facadc98463313ade231ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 29 Oct 2025 19:16:25 +0800 Subject: [PATCH 3/4] packages/ruler: update --- nix/packages/by-name/ruler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index a3e06027..a393fb6d 100644 --- a/nix/packages/by-name/ruler/package.nix +++ b/nix/packages/by-name/ruler/package.nix @@ -12,8 +12,8 @@ domain = "git.confusedcompiler.org"; owner = "leana8959"; repo = "ruler"; - rev = "4c374125ec9f566638e64671f468e598b33730e6"; - hash = "sha256-n5xNC31t5S+h5WoT6iaJV2JxomxKLqz6gGF0KrM8YjQ="; + rev = "46f40d303f3b04d65475fdfd6511dd6431f20f24"; + hash = "sha256-goJ4iYnFqn88y6xEBhaFnos8O1MWIqHzwGrR1W0yijo="; }) {}; From d9940eb52e4623aa6af83526aadfefa5a68246c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 29 Oct 2025 21:05:32 +0800 Subject: [PATCH 4/4] home/fish: disable patdiff for fzf.fish --- nix/homeModules/common/fish/default.nix | 2 +- nix/homeModules/common/fish/shellInit.fish | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nix/homeModules/common/fish/default.nix b/nix/homeModules/common/fish/default.nix index a09b371d..240a6c29 100644 --- a/nix/homeModules/common/fish/default.nix +++ b/nix/homeModules/common/fish/default.nix @@ -10,7 +10,7 @@ # # Script dependencies # - home.packages = [pkgs.vivid pkgs.patdiff]; + home.packages = [pkgs.vivid]; programs = { fd.enable = true; fzf.enable = true; diff --git a/nix/homeModules/common/fish/shellInit.fish b/nix/homeModules/common/fish/shellInit.fish index 8cb17970..0a1cfd24 100644 --- a/nix/homeModules/common/fish/shellInit.fish +++ b/nix/homeModules/common/fish/shellInit.fish @@ -80,7 +80,8 @@ end set -x fzf_preview_file_cmd 'cat -n' # fzf-fish search hidden files set -x fzf_fd_opts --hidden --exclude=.git -set -x fzf_diff_highlighter patdiff +# fzf-fish using patdiff would show incomplete diff, it is a bug +# don't do it # fd uses LS_COLORS set -x LS_COLORS (vivid -m 24-bit generate solarized-light) # similar to milou