From 449d4ec6736e99c362a7dc1a58faa153a96acf5b Mon Sep 17 00:00:00 2001 From: Noah Masur Date: Tue, 20 Apr 2021 17:24:35 -0400 Subject: [PATCH] Vimwiki enhancements --- alacritty.configlink/alacritty.yml | 135 ++++++++++++++++++++- fish.configlink/functions/abbrs.fish | 2 +- fish.configlink/functions/note-header.fish | 2 +- nvim.configlink/settings/custom.vim | 12 ++ nvim.configlink/settings/vimwiki.vim | 1 + 5 files changed, 144 insertions(+), 8 deletions(-) diff --git a/alacritty.configlink/alacritty.yml b/alacritty.configlink/alacritty.yml index 912c0e8..489988d 100644 --- a/alacritty.configlink/alacritty.yml +++ b/alacritty.configlink/alacritty.yml @@ -589,12 +589,135 @@ shell: # If the same trigger is assigned to multiple actions, all of them are executed # in the order they were defined in. key_bindings: - - { key: F, mods: Super, action: ToggleSimpleFullscreen } - - { key: A, mods: Super, chars: "\x02" } # CMD-A sends CTRL-B for tmux - - { key: D, mods: Super, chars: "\x14" } # CMD-D sends CTRL-T for fzf - - { key: O, mods: Super, chars: "edit\x0D" } # CMD-O opens file in vim - - { key: Return, mods: Shift, chars: "\x1b[13;2u" } - - { key: E, mods: Alt, chars: "\x1be" } # Send ALT-E for fish + - { key: F, mods: Super, action: ToggleSimpleFullscreen } + - { key: A, mods: Super, chars: "\x02" } # CMD-A sends CTRL-B for tmux + - { key: D, mods: Super, chars: "\x14" } # CMD-D sends CTRL-T for fzf + - { key: O, mods: Super, chars: "edit\x0D" } # CMD-O opens file in vim + + - { key: Return, mods: Shift, chars: "\x1b[13;2u" } + - { key: N, mods: Command, action: SpawnNewInstance } + - { key: PageUp, action: ScrollPageUp } + - { key: PageUp, mode: Alt, chars: "\x1B[5~" } + - { key: PageUp, mods: Shift, chars: "\x1B[5~" } + - { key: PageDown, action: ScrollPageDown } + - { key: PageDown, mode: Alt, chars: "\x1B[6~" } + - { key: PageDown, mods: Shift, chars: "\x1B[6~" } + - { key: Home, action: ScrollToTop } + - { key: Home, mode: Alt, chars: "\x1BOH" } + - { key: Home, mods: Shift, chars: "\x1B[H" } + - { key: End, action: ScrollToBottom } + - { key: End, mode: Alt, chars: "\x1BOF" } + - { key: End, mods: Shift, chars: "\x1B[F" } + - { key: Tab, mods: Alt, chars: "\x1B\t" } + - { key: Tab, mods: Alt|Shift, chars: "\x1B\x1B[Z" } + - { key: Back, chars: "\x7F" } + - { key: Back, mods: Alt, chars: "\x1B\x7F" } + - { key: Back, mods: Alt|Shift, chars: "\x1B\x08" } + - { key: Space, mods: Control, chars: "\x00" } + - { key: Space, mods: Alt, chars: "\x20" } + - { key: Left, mods: Alt, chars: "\x1Bb" } + - { key: Left, mods: Alt|Shift, chars: "\x1B\x1B[D" } + - { key: Right, mods: Alt, chars: "\x1Bf" } + - { key: Right, mods: Alt|Shift, chars: "\x1B\x1B[C" } + - { key: Down, mods: Alt, chars: "\x1B\x1B[B" } + - { key: Down, mods: Alt|Shift, chars: "\x1B\x1B[B" } + - { key: Up, mods: Alt, chars: "\x1B\x1B[A" } + - { key: Up, mods: Alt|Shift, chars: "\x1B\x1B[A" } + - { key: A, mods: Alt, chars: "\x1Ba" } + - { key: A, mods: Alt|Shift, chars: "\x1BA" } + - { key: B, mods: Alt, chars: "\x1Bb" } + - { key: B, mods: Alt|Shift, chars: "\x1BB" } + - { key: C, mods: Alt, chars: "\x1Bc" } + - { key: C, mods: Alt|Shift, chars: "\x1BC" } + - { key: D, mods: Alt, chars: "\x1Bd" } + - { key: D, mods: Alt|Shift, chars: "\x1BD" } + - { key: E, mods: Alt, chars: "\x1Be" } + - { key: E, mods: Alt|Shift, chars: "\x1BE" } + - { key: F, mods: Alt, chars: "\x1Bf" } + - { key: F, mods: Alt|Shift, chars: "\x1BF" } + - { key: G, mods: Alt, chars: "\x1Bg" } + - { key: G, mods: Alt|Shift, chars: "\x1BG" } + - { key: H, mods: Alt, chars: "\x1Bh" } + - { key: H, mods: Alt|Shift, chars: "\x1BH" } + - { key: I, mods: Alt, chars: "\x1Bi" } + - { key: I, mods: Alt|Shift, chars: "\x1BI" } + - { key: J, mods: Alt, chars: "\x1Bj" } + - { key: J, mods: Alt|Shift, chars: "\x1BJ" } + - { key: K, mods: Alt, chars: "\x1Bk" } + - { key: K, mods: Alt|Shift, chars: "\x1BK" } + - { key: L, mods: Alt, chars: "\x1Bl" } + - { key: L, mods: Alt|Shift, chars: "\x1BL" } + - { key: M, mods: Alt, chars: "\x1Bm" } + - { key: M, mods: Alt|Shift, chars: "\x1BM" } + - { key: N, mods: Alt, chars: "\x1Bn" } + - { key: N, mods: Alt|Shift, chars: "\x1BN" } + - { key: O, mods: Alt, chars: "\x1Bo" } + - { key: O, mods: Alt|Shift, chars: "\x1BO" } + - { key: P, mods: Alt, chars: "\x1Bp" } + - { key: P, mods: Alt|Shift, chars: "\x1BP" } + - { key: Q, mods: Alt, chars: "\x1Bq" } + - { key: Q, mods: Alt|Shift, chars: "\x1BQ" } + - { key: R, mods: Alt, chars: "\x1Br" } + - { key: R, mods: Alt|Shift, chars: "\x1BR" } + - { key: S, mods: Alt, chars: "\x1Bs" } + - { key: S, mods: Alt|Shift, chars: "\x1BS" } + - { key: T, mods: Alt, chars: "\x1Bt" } + - { key: T, mods: Alt|Shift, chars: "\x1BT" } + - { key: U, mods: Alt, chars: "\x1Bu" } + - { key: U, mods: Alt|Shift, chars: "\x1BU" } + - { key: V, mods: Alt, chars: "\x1Bv" } + - { key: V, mods: Alt|Shift, chars: "\x1BV" } + - { key: W, mods: Alt, chars: "\x1Bw" } + - { key: W, mods: Alt|Shift, chars: "\x1BW" } + - { key: X, mods: Alt, chars: "\x1Bx" } + - { key: X, mods: Alt|Shift, chars: "\x1BX" } + - { key: Y, mods: Alt, chars: "\x1By" } + - { key: Y, mods: Alt|Shift, chars: "\x1BY" } + - { key: Z, mods: Alt, chars: "\x1Bz" } + - { key: Z, mods: Alt|Shift, chars: "\x1BZ" } + - { key: Key1, mods: Alt, chars: "\x1B1" } + - { key: Key1, mods: Alt|Shift, chars: "\x1B!" } + - { key: Key2, mods: Alt, chars: "\x1B2" } + - { key: Key2, mods: Alt|Shift, chars: "\x1B#" } + - { key: Key3, mods: Alt, chars: "\x1B3" } + - { key: Key3, mods: Alt|Shift, chars: "\x1B#" } + - { key: Key4, mods: Alt, chars: "\x1B4" } + - { key: Key4, mods: Alt|Shift, chars: "\x1B$" } + - { key: Key5, mods: Alt, chars: "\x1B5" } + - { key: Key5, mods: Alt|Shift, chars: "\x1B%" } + - { key: Key6, mods: Alt, chars: "\x1B6" } + - { key: Key6, mods: Alt|Shift, chars: "\x1B^" } + - { key: Key7, mods: Alt, chars: "\x1B7" } + - { key: Key7, mods: Alt|Shift, chars: "\x1B&" } + - { key: Key8, mods: Alt, chars: "\x1B8" } + - { key: Key8, mods: Alt|Shift, chars: "\x1B*" } + - { key: Key9, mods: Alt, chars: "\x1B9" } + - { key: Key9, mods: Alt|Shift, chars: "\x1B(" } + - { key: Key0, mods: Alt, chars: "\x1B0" } + - { key: Key0, mods: Alt|Shift, chars: "\x1B)" } + - { key: Minus, mods: Alt, chars: "\x1B-" } + - { key: Minus, mods: Alt|Shift, chars: "\x1B_" } + - { key: Equals, mods: Alt, chars: "\x1B=" } + - { key: Equals, mods: Alt|Shift, chars: "\x1B+" } + - { key: LBracket, mods: Alt, chars: "\x1B[" } + - { key: LBracket, mods: Alt|Shift, chars: "\x1B{" } + - { key: RBracket, mods: Alt, chars: "\x1B]" } + - { key: RBracket, mods: Alt|Shift, chars: "\x1B}" } + - { key: Backslash, mods: Alt, chars: "\x1B\\" } + - { key: Backslash, mods: Alt|Shift, chars: "\x1B|" } + - { key: Semicolon, mods: Alt, chars: "\x1B;" } + - { key: Semicolon, mods: Alt|Shift, chars: "\x1B:" } + - { key: Apostrophe, mods: Alt, chars: "\x1B'" } + - { key: Apostrophe, mods: Alt|Shift, chars: "\x1B\"" } + - { key: Comma, mods: Alt, chars: "\x1B," } + - { key: Comma, mods: Alt|Shift, chars: "\x1B<" } + - { key: Period, mods: Alt, chars: "\x1B." } + - { key: Period, mods: Alt|Shift, chars: "\x1B>" } + - { key: Slash, mods: Alt, chars: "\x1B/" } + - { key: Slash, mods: Alt|Shift, chars: "\x1B?" } + - { key: Grave, mods: Alt, chars: "\x1B`" } + - { key: Grave, mods: Alt|Shift, chars: "\x1B~" } + # - { key: E, mods: Alt, chars: "\x1be" } # Send ALT-E for fish #- { key: Paste, action: Paste } #- { key: Copy, action: Copy } diff --git a/fish.configlink/functions/abbrs.fish b/fish.configlink/functions/abbrs.fish index 70b7a7a..00fe92a 100644 --- a/fish.configlink/functions/abbrs.fish +++ b/fish.configlink/functions/abbrs.fish @@ -53,7 +53,7 @@ function abbrs --description 'All abbreviations' abbr -a vh 'vim -c "Hist"' # Notes - abbr -a qn 'quicknote "' + abbr -a qn 'quicknote' abbr -a sn 'syncnotes' # Improved CLI Tools diff --git a/fish.configlink/functions/note-header.fish b/fish.configlink/functions/note-header.fish index 590f5c8..97fd189 100644 --- a/fish.configlink/functions/note-header.fish +++ b/fish.configlink/functions/note-header.fish @@ -1,4 +1,4 @@ function note-header set -g CURRENT_WEATHER (curl -s "https://wttr.in/?format=1") - set -g JOURNAL_HEADER "[Yesterday]($YESTERDAY_NOTE.md) | [Home](home.md) | [Tomorrow]($TOMORROW_NOTE.md)\n\n$LONG_DATE\n$CURRENT_WEATHER\n#journal\n\n---\n\n# Today's Goals\n\n\n# Journal\n\n" + set -g JOURNAL_HEADER "[Yesterday]($YESTERDAY_NOTE.md) | [Home](home.md) | [Tomorrow]($TOMORROW_NOTE.md)\n\n$LONG_DATE\n$CURRENT_WEATHER\n#journal\n\n---\n\n\n# Journal\n\n" end diff --git a/nvim.configlink/settings/custom.vim b/nvim.configlink/settings/custom.vim index 05f38f3..8495606 100644 --- a/nvim.configlink/settings/custom.vim +++ b/nvim.configlink/settings/custom.vim @@ -3,6 +3,7 @@ command! Vimrc edit $MYVIMRC " Edit .vimrc (this file) command! Refresh source $MYVIMRC " Refresh from .vimrc (this file) +command! Today exe 'edit ~/notes/journal/'.strftime("%Y-%m-%d_%a").'.md' " Custom Keybinds "---------------- @@ -16,6 +17,14 @@ nnoremap :noh " Replace all nnoremap S :%s//g +" Shuffle lines around +nnoremap :m .+1== +nnoremap :m .-2== +inoremap :m .+1==gi +inoremap :m .-2==gi +vnoremap :m '>+1gv=gv +vnoremap :m '<-2gv=gv + " Jump to text in this directory nnoremap / :Rg @@ -62,6 +71,9 @@ nnoremap ` :GitGutterToggle " Git push nnoremap gp :Git push +" Git repo +nnoremap gr :!gh repo view -w + " Split window nnoremap ws :vsplit diff --git a/nvim.configlink/settings/vimwiki.vim b/nvim.configlink/settings/vimwiki.vim index 60b06f5..8574ce9 100644 --- a/nvim.configlink/settings/vimwiki.vim +++ b/nvim.configlink/settings/vimwiki.vim @@ -16,3 +16,4 @@ let g:vimwiki_key_mappings = \ } let g:vimwiki_auto_chdir = 1 " Set local dir to Wiki when open let g:vimwiki_create_link = 0 " Don't automatically create new links +let g:vimwiki_listsyms = ' x' " Set checkbox symbol progression