From bbbf487d4d143a737227a14a7c825999b92830d1 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 6 Sep 2024 16:04:27 +0200 Subject: [PATCH] Fix kitty font config --- dot_config/fish/conf.d/zoxide.fish | 26 ------------------- dot_config/fish/config.fish.tmpl | 1 + dot_config/fish/functions/__zoxide_cd.fish | 6 ----- dot_config/fish/functions/__zoxide_pwd.fish | 7 ----- dot_config/fish/functions/__zoxide_z.fish | 13 ---------- .../fish/functions/__zoxide_z_complete.fish | 15 ----------- dot_config/fish/functions/__zoxide_zi.fish | 4 --- dot_config/kitty/kitty.conf.tmpl | 11 +++++--- 8 files changed, 9 insertions(+), 74 deletions(-) delete mode 100644 dot_config/fish/conf.d/zoxide.fish delete mode 100644 dot_config/fish/functions/__zoxide_cd.fish delete mode 100644 dot_config/fish/functions/__zoxide_pwd.fish delete mode 100644 dot_config/fish/functions/__zoxide_z.fish delete mode 100644 dot_config/fish/functions/__zoxide_z_complete.fish delete mode 100644 dot_config/fish/functions/__zoxide_zi.fish diff --git a/dot_config/fish/conf.d/zoxide.fish b/dot_config/fish/conf.d/zoxide.fish deleted file mode 100644 index 169e2af..0000000 --- a/dot_config/fish/conf.d/zoxide.fish +++ /dev/null @@ -1,26 +0,0 @@ -if ! status is-interactive || - ! command --query zoxide - exit -end - -functions --query __zoxide_cd_internal || functions --copy cd __zoxide_cd_internal - -set --query zoxide_hook || set --local zoxide_hook --on-variable PWD -if test -n "$zoxide_hook" - function __zoxide_hook $zoxide_hook - test -z "$fish_private_mode" - and command zoxide add -- (__zoxide_pwd) - end -end - -set --query zoxide_cmd || set --local zoxide_cmd z -if test -n "$zoxide_cmd" - function $zoxide_cmd - __zoxide_z $argv - end - complete $zoxide_cmd --no-files -a '(__zoxide_z_complete)' - - function "$zoxide_cmd"i - __zoxide_zi $argv - end -end diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl index 3f15ed4..238535b 100644 --- a/dot_config/fish/config.fish.tmpl +++ b/dot_config/fish/config.fish.tmpl @@ -16,5 +16,6 @@ if status is-interactive fish_vi_key_bindings atuin init fish | source + zoxide init fish | source starship init fish | source end diff --git a/dot_config/fish/functions/__zoxide_cd.fish b/dot_config/fish/functions/__zoxide_cd.fish deleted file mode 100644 index d5a8b2b..0000000 --- a/dot_config/fish/functions/__zoxide_cd.fish +++ /dev/null @@ -1,6 +0,0 @@ -function __zoxide_cd - __zoxide_cd_internal $argv - if test "$_ZO_ECHO" = 1 - __zoxide_pwd - end -end diff --git a/dot_config/fish/functions/__zoxide_pwd.fish b/dot_config/fish/functions/__zoxide_pwd.fish deleted file mode 100644 index 49f9357..0000000 --- a/dot_config/fish/functions/__zoxide_pwd.fish +++ /dev/null @@ -1,7 +0,0 @@ -function __zoxide_pwd - if test "$_ZO_RESOLVE_SYMLINKS" = 1 - builtin pwd -P - else - builtin pwd -L - end -end diff --git a/dot_config/fish/functions/__zoxide_z.fish b/dot_config/fish/functions/__zoxide_z.fish deleted file mode 100644 index bb24f69..0000000 --- a/dot_config/fish/functions/__zoxide_z.fish +++ /dev/null @@ -1,13 +0,0 @@ -function __zoxide_z - set --local argc (count $argv) - if test $argc -eq 0 - __zoxide_cd $HOME - else if test "$argv" = - - __zoxide_cd - - else if test $argc -eq 1 -a -d $argv[1] - __zoxide_cd $argv[1] - else - set --local result (command zoxide query --exclude (__zoxide_pwd) -- $argv) - and __zoxide_cd $result - end -end diff --git a/dot_config/fish/functions/__zoxide_z_complete.fish b/dot_config/fish/functions/__zoxide_z_complete.fish deleted file mode 100644 index 9e6196f..0000000 --- a/dot_config/fish/functions/__zoxide_z_complete.fish +++ /dev/null @@ -1,15 +0,0 @@ -function __zoxide_z_complete - set --local tokens (commandline --current-process --tokenize) - set --local curr_tokens (commandline --cut-at-cursor --current-process --tokenize) - - if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1 - # If there are < 2 arguments, use `cd` completions. - __fish_complete_directories "$tokens[2]" '' - else if test (count $tokens) -eq (count $curr_tokens) - # If the last argument is empty, use interactive selection. - set --local query $tokens[2..-1] - set --local result (zoxide query --interactive -- $query) - commandline --current-process "$tokens[1] "(string escape $result) - commandline --function repaint - end -end diff --git a/dot_config/fish/functions/__zoxide_zi.fish b/dot_config/fish/functions/__zoxide_zi.fish deleted file mode 100644 index 35837ac..0000000 --- a/dot_config/fish/functions/__zoxide_zi.fish +++ /dev/null @@ -1,4 +0,0 @@ -function __zoxide_zi - set --local result (command zoxide query --interactive -- $argv) - and __zoxide_cd $result -end diff --git a/dot_config/kitty/kitty.conf.tmpl b/dot_config/kitty/kitty.conf.tmpl index 9e8d473..8b1b678 100644 --- a/dot_config/kitty/kitty.conf.tmpl +++ b/dot_config/kitty/kitty.conf.tmpl @@ -1,9 +1,7 @@ -font_family BrutalistMono Nerd Font -bold_font BrutalistMono Nerd Font Bold -italic_font BrutalistMono Nerd Font Italic font_size {{ .fontsize }} text_composition_strategy 1.0 +symbol_map U+f101-U+f25c nonicons # scrollback_lines 2000 #: Number of lines of history to keep in memory for scrolling back. @@ -606,3 +604,10 @@ map kitty_mod+R set_tab_title # BEGIN_KITTY_THEME include Nord.conf # END_KITTY_THEME + +# BEGIN_KITTY_FONTS +font_family family="Brutalist Mono" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS