Merge branch 'master' of github.com:nojhan/dotfiles
This commit is contained in:
commit
1b07797e8d
1165 changed files with 1602 additions and 254 deletions
11
kak/kakrc
11
kak/kakrc
|
|
@ -327,6 +327,7 @@ plug "dmerejkowsky/kak-spell" config %{
|
|||
|
||||
map global user g '/[<lt><gt>=]{7}<ret>vv' -docstring 'Search for Git conflict markers'
|
||||
|
||||
<<<<<<< HEAD
|
||||
set-option -add global ui_options ncurses_padding_char=╱ # Examples: ▚ ╳ ╱ ┼ ╲
|
||||
|
||||
# add-highlighter global/ scrollbar
|
||||
|
|
@ -334,6 +335,16 @@ set-option -add global ui_options ncurses_padding_char=╱ # Examples: ▚ ╳
|
|||
# add-highlighter global/scrollbar/ scrollbar-indicator yellow,default lint_flags
|
||||
# # add-highlighter global/scrollbar/ scrollbar-indicator red,default git_diff_flags
|
||||
# # git show-diff
|
||||
=======
|
||||
#set-option -add global ui_options ncurses_padding_char=╱ # Examples: ▚ ╳ ╱ ┼ ╲
|
||||
set-option -add global ui_options ncurses_padding_char=/ # Examples: ▚ ╳ ╱ ┼ ╲
|
||||
|
||||
add-highlighter global/ scrollbar
|
||||
add-highlighter global/scrollbar/ scrollbar-indicator red,default lsp_error_lines
|
||||
add-highlighter global/scrollbar/ scrollbar-indicator yellow,default lint_flags
|
||||
# add-highlighter global/scrollbar/ scrollbar-indicator red,default git_diff_flags
|
||||
# git show-diff
|
||||
>>>>>>> eb1e2f43fd3a3995350a6bd207f2884271c5aa4a
|
||||
|
||||
|
||||
# Force `liquidprompt` to be a shell filetype.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue