diff --git a/dotfiles/git/config b/dotfiles/git/config index b9d6ecc..6b676cb 100644 --- a/dotfiles/git/config +++ b/dotfiles/git/config @@ -30,13 +30,13 @@ [pager] # differ is a program that shows word-by-word diff #{%@@ if editor == "kak" @@%}# - log = diffr | kak-pager - show = diffr | kak-pager - diff = diffr | kak-pager + log = _diffr | kak-pager + show = _diffr | kak-pager + diff = _diffr | kak-pager #{%@@ else @@%}# - log = diffr | less - show = diffr | less - diff = diffr | less + log = _diffr | less + show = _diffr | less + diff = _diffr | less #{%@@ endif @@%}# [alias] diff --git a/dotfiles/kak/hooks.kak b/dotfiles/kak/hooks.kak index 2768507..64327ac 100644 --- a/dotfiles/kak/hooks.kak +++ b/dotfiles/kak/hooks.kak @@ -23,7 +23,7 @@ evaluate-commands %sh{ define-command -override diffr %{ try %{ execute-keys -draft 'ggxsdiff' - execute-keys -draft '%J| diffr' + execute-keys -draft '%J| _diffr' ansi-render } } diff --git a/dotfiles/scripts/diffr b/dotfiles/scripts/_diffr similarity index 93% rename from dotfiles/scripts/diffr rename to dotfiles/scripts/_diffr index bb04bf5..18ef8a3 100755 --- a/dotfiles/scripts/diffr +++ b/dotfiles/scripts/_diffr @@ -1,6 +1,6 @@ #!/bin/sh -/usr/bin/env diffr \ +exec /usr/bin/env diffr \ --colors 'refine-added:foreground:green:underline' \ --colors 'refine-added:background:none' \ --colors 'refine-removed:foreground:red:underline' \ diff --git a/void.freeze b/void.freeze index eefcdd0..ab4beab 100644 --- a/void.freeze +++ b/void.freeze @@ -19,6 +19,7 @@ caffeine-ng-3.5.1_2 cargo-edit-0.8.0_1 chromium-97.0.4692.99_1 clyrics-0.13_1 +cmake-3.22.1_1 cmatrix-2.0_1 cool-retro-term-1.1.1_1 cronie-1.5.7_1 @@ -123,6 +124,7 @@ neovim-0.6.1_1 nerd-fonts-2.1.0_3 net-tools-1.60.20181103git_1 netcat-0.7.1_7 +nix-2.3.12_1 nmap-7.80_6 nodejs-16.13.2_2 notify-send.sh-1.2_1 @@ -153,6 +155,7 @@ pqiv-2.12_1 protontricks-1.6.1_1 pulseaudio-15.0_3 pulsemixer-1.5.1_2 +pup-0.4.0_12 python3-ipython-7.31.0_1 python3-neovim-0.4.3_2 python3-pip-22.0.2_1 @@ -164,6 +167,7 @@ qt5ct-1.5_1 qutebrowser-2.4.0_1 ranger-1.9.3_3 rclone-1.57.0_1 +recode-3.6_10 ripgrep-13.0.0_1 rsync-3.2.3_3 rust-analyzer-2021.08.30_1