diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index add73a9..f3c6fab 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -38,4 +38,4 @@ SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_user_paths:/home/joe/\x2elocal/share/JetBrains/Toolbox/scripts\x1e/home/joe/\x2elocal/bin/jetbrains\x1e/home/joe/\x2elocal/share/JetBrains/Toolbox/script\x1e/home/joe/\x2elocal/share/solana/install/active_release/bin\x1e/home/joe/\x2edotnet/tools\x1e/home/joe/\x2elocal/bin +SETUVAR fish_user_paths:/home/joe/\x2elocal/share/cargo/bin\x1e/home/joe/\x2elocal/share/JetBrains/Toolbox/scripts\x1e/home/joe/\x2elocal/bin/jetbrains\x1e/home/joe/\x2elocal/share/JetBrains/Toolbox/script\x1e/home/joe/\x2elocal/share/solana/install/active_release/bin\x1e/home/joe/\x2edotnet/tools\x1e/home/joe/\x2elocal/bin diff --git a/.config/fish/functions/select-kitty-theme.fish b/.config/fish/functions/kitty_select_theme.fish similarity index 100% rename from .config/fish/functions/select-kitty-theme.fish rename to .config/fish/functions/kitty_select_theme.fish diff --git a/.config/kak/kakrc b/.config/kak/kakrc index 94dfda0..cbfbaba 100644 --- a/.config/kak/kakrc +++ b/.config/kak/kakrc @@ -1,7 +1,7 @@ -source /home/joe/.config/kak/plugins/plug.kak/rc/plug.kak -colorscheme tomorrow-night +# source /home/joe/.config/kak/plugins/plug.kak/rc/plug.kak +colorscheme gruvbox-dark -ranger-open-on-edit-directory +# ranger-open-on-edit-directory set-option global tabstop 4 @@ -14,13 +14,13 @@ hook global BufCreate .*Fastfile %{ } # Plugins -plug "andreyorst/plug.kak" noload -plug "danr/kakoune-easymotion" -plug "h-youhei/kakoune-surround" -plug "Delapouite/kakoune-i3" -plug "lexherbo2/auto-pairs.kak" -plug "Delapouite/kakoune-buffers" -plug "Screwtapello/kakoune-cargo" +# plug "andreyorst/plug.kak" noload +# plug "danr/kakoune-easymotion" +# plug "h-youhei/kakoune-surround" +# plug "Delapouite/kakoune-i3" +# plug "lexherbo2/auto-pairs.kak" +# plug "Delapouite/kakoune-buffers" +# plug "Screwtapello/kakoune-cargo" # Highlighters addhl global/ number-lines -relative -hlcursor -separator ' ' @@ -127,19 +127,3 @@ map global normal :extend-prev-subword -docstring 'extend to previous map global user b ':enter-buffers-mode' -docstring 'buffers…' map global user B ':info-buffers' -docstring 'buffer list' -# Rust -hook global BufCreate .*\.(py|rs) %{ - eval %sh{kak-lsp --kakoune -s $kak_session} - - set-option global lsp_auto_highlight_references true - # set-option global lsp_hover_insert_mode_trigger true - lsp-auto-hover-insert-mode-enable - lsp-auto-signature-help-enable - map global normal D ':lsp-hover' - map global insert ':lsp-hover' - map global normal '#' ':enter-user-mode lsp' - - map global user c ':enter-user-modecargo' - map global cargo b ':cargo build' -} - diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 184c7ed..b7ca40e 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -31,5 +31,8 @@ map shift+left move_window left map shift+right move_window right map shift+down move_window down +map f1 launch --type overlay --stdin-add-formatting --stdin-source=@screen_scrollback ~/.config/kitty/pager.sh + # scrollback_pager bash -c 'nvim " -c "autocmd TermOpen * normal G" -c "terminal cat /proc/$$/fd/0 -" -c "set clipboard+=unnamedplus" -c "call cursor(CURSOR_LINE, CURSOR_COLUMN)"' -scrollback_pager nvim -u ~/.config/nvim/init-kitty.vim -c "map q :qa!" -c "set norelativenumber nonumber nolist showtabline=0 foldcolumn=0" -c "autocmd TermOpen * normal G" -c "silent! write /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - " +# scrollback_pager nvim -u ~/.config/nvim/init-kitty.vim -c "map q :qa!" -c "set norelativenumber nonumber nolist showtabline=0 foldcolumn=0" -c "autocmd TermOpen * normal G" -c "silent! write /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - " +scrollback_pager bash -c "exec nvim 63<&0 0 q :qa!' -c 'set shell=bash scrollback=100000 termguicolors laststatus=0 clipboard+=unnamedplus' -c 'autocmd TermEnter * stopinsert' -c 'autocmd TermClose * call cursor(max([0,INPUT_LINE_NUMBER-1])+CURSOR_LINE, CURSOR_COLUMN)' -c 'terminal sed