From eb2d096fa2ecac807d8109794ba5bb053735c751 Mon Sep 17 00:00:00 2001 From: Michel Date: Tue, 31 Oct 2023 19:03:54 +0100 Subject: [PATCH 1/6] fix(lg): better "cd-on-quit" --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index d680ddb..09450bd 100644 --- a/.zshrc +++ b/.zshrc @@ -209,7 +209,7 @@ alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' lg() { - export LAZYGIT_NEW_DIR_FILE=~/.lazygit/newdir + export LAZYGIT_NEW_DIR_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/lazygit/cd-on-quit_$$" lazygit "$@" if [ -f $LAZYGIT_NEW_DIR_FILE ]; then cd "$(cat $LAZYGIT_NEW_DIR_FILE)" From 45525b2bf1f8a5fb67529abbff7955a648b1cf82 Mon Sep 17 00:00:00 2001 From: Michel Date: Tue, 31 Oct 2023 19:04:15 +0100 Subject: [PATCH 2/6] doc: dump kitty changelog --- .README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.README.md b/.README.md index 5a572ee..795ed19 100644 --- a/.README.md +++ b/.README.md @@ -106,6 +106,7 @@ git apply --stat --apply 2604.patch ``` sudo apt-get install kitty-terminfo +(kitty --version && curl https://sw.kovidgoyal.net/kitty/changelog/ | html2text) | less sh ~/.config/kitty/installer.sh ``` From 98b16d6895f51135b0e367f1d87b0fdc8641039b Mon Sep 17 00:00:00 2001 From: Michel Date: Tue, 7 Nov 2023 19:46:08 +0100 Subject: [PATCH 3/6] feat(kitty): switch to "Tango Dark" theme --- .config/kitty/Paul Millr.conf | 21 --------------------- .config/kitty/Tango Dark.conf | 21 +++++++++++++++++++++ .config/kitty/kitty.conf | 5 ++++- 3 files changed, 25 insertions(+), 22 deletions(-) delete mode 100644 .config/kitty/Paul Millr.conf create mode 100644 .config/kitty/Tango Dark.conf diff --git a/.config/kitty/Paul Millr.conf b/.config/kitty/Paul Millr.conf deleted file mode 100644 index 72cc95c..0000000 --- a/.config/kitty/Paul Millr.conf +++ /dev/null @@ -1,21 +0,0 @@ -background #000000 -foreground #f1f1f1 -cursor #4c4c4c -selection_background #414141 -color0 #2a2a2a -color8 #666666 -color1 #ff0000 -color9 #ff007f -color2 #78ff0e -color10 #66ff66 -color3 #e6be00 -color11 #f3d64d -color4 #396ad6 -color12 #7099ec -color5 #b348bd -color13 #da66e5 -color6 #66ccff -color14 #79def1 -color7 #bababa -color15 #ffffff -selection_foreground #000000 diff --git a/.config/kitty/Tango Dark.conf b/.config/kitty/Tango Dark.conf new file mode 100644 index 0000000..6be2e09 --- /dev/null +++ b/.config/kitty/Tango Dark.conf @@ -0,0 +1,21 @@ +background #000000 +foreground #ffffff +cursor #ffffff +selection_background #b4d5ff +color0 #000000 +color8 #555753 +color1 #cc0000 +color9 #ef2929 +color2 #4e9a06 +color10 #8ae234 +color3 #c4a000 +color11 #fce94f +color4 #3465a4 +color12 #729fcf +color5 #75507b +color13 #ad7fa8 +color6 #06989a +color14 #34e2e2 +color7 #d3d7cf +color15 #eeeeec +selection_foreground #000000 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index f457dbf..e0f4412 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -99,7 +99,10 @@ inactive_tab_font_style italic #: Color scheme {{{1 -include Paul Millr.conf +# BEGIN_KITTY_THEME +include Tango Dark.conf +# END_KITTY_THEME + background_opacity 1.00 cursor #f41 selection_background none From f23fa2463e727609db24c681f50d19986c648c2a Mon Sep 17 00:00:00 2001 From: Michel Date: Tue, 7 Nov 2023 19:47:37 +0100 Subject: [PATCH 4/6] doc: reword ReadMe --- .README.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.README.md b/.README.md index 795ed19..808d219 100644 --- a/.README.md +++ b/.README.md @@ -101,8 +101,8 @@ git apply --stat --apply 2604.patch - https://sw.kovidgoyal.net/kitty/binary/ - Install `JetBrains Mono` (without NF) & `NerdFontsSymbolsOnly` fonts. - - Note: outside of kitty, it may be interesting to also install _JetBrains - Mono_ *with* _NF_. + - Note: outside of kitty, it may be interesting to also install + _JetBrains Mono_ *with* _NF_. ``` sudo apt-get install kitty-terminfo @@ -117,14 +117,15 @@ So it is more coherent/simpler to copy this behaviour into Zsh. ## lazygit -```` -sudo apt install git-delta -```` +### Dependencies + +- git-delta ### Binary Releases ``` -LOCATION=$(curl -s https://api.github.com/repos/jesseduffield/lazygit/releases/latest \ +URI=https://api.github.com/repos/jesseduffield/lazygit +LOCATION=$(curl -s $URI/releases/latest \ | grep "browser_download_url.*Linux_x86_64" \ | awk '{ print $2 }' \ | sed 's/,$//' \ @@ -153,9 +154,15 @@ go install ## neovim -``` -sudo apt install libfuse2 xsel +### Dependencies +- kitty / NerdFont +- libfuse2 +- xsel + +### Binary Nightly Release + +``` mkdir -p $HOME/.local/bin cd $HOME/.local/bin From 44e0f84be58764668b9803c8edc003bbb0640227 Mon Sep 17 00:00:00 2001 From: Michel Date: Wed, 8 Nov 2023 11:06:38 +0100 Subject: [PATCH 5/6] doc: clean zshrc --- .zshrc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.zshrc b/.zshrc index 09450bd..4399fc9 100644 --- a/.zshrc +++ b/.zshrc @@ -40,8 +40,7 @@ typeset -U path fpath ### ASDF # -# The direnv plugin is not up-to-date with new `asdf direnv setup` command. -# +# Line below from `asdf direnv setup --version latest` source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc" ### b4b4r07/enhancd @@ -276,14 +275,6 @@ fi export BROWSER=firefox export EDITOR=vi - -# -i Searches ignore case -# -F Automatically exit if the entire file can be displayed -# -R ANSI "color" escape sequences are output in "raw" form -# -S Chop long lines -# -X Disables sending the termcap initialization and deinitialization -# -M Long prompt -# -K Quit on ^C export LESS=-iFRS export SYSTEMD_LESS='iFRSXMK' From 571c38670a67964ae3197c2b26bc7180a0e2ab36 Mon Sep 17 00:00:00 2001 From: Michel Date: Wed, 8 Nov 2023 11:21:34 +0100 Subject: [PATCH 6/6] feat(SSH): export KeePass SSH Agent --- .zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.zshrc b/.zshrc index 4399fc9..c9fd4f7 100644 --- a/.zshrc +++ b/.zshrc @@ -278,6 +278,9 @@ export EDITOR=vi export LESS=-iFRS export SYSTEMD_LESS='iFRSXMK' +# KeePassXC SSH Agent +[[ -v SSH_AUTH_SOCK ]] || export SSH_AUTH_SOCK=$(echo /tmp/ssh-*/agent.*(U)) + ### ### History