Update neovim settings
diff --git a/modules/neovim/binds/binds.vim b/modules/neovim/binds/binds.vim
index 794659c..94390b7 100644
--- a/modules/neovim/binds/binds.vim
+++ b/modules/neovim/binds/binds.vim
@@ -1,6 +1,14 @@
set whichwrap=b,s,<,>,[,]
set mouse=a
+vnoremap <F12> <Esc>
+inoremap <F12> <Esc>
+nnoremap <F12> <Esc>
+tnoremap <F12> <C-C>
+cnoremap <F12> <Esc>
+onoremap <F12> <Esc>
+snoremap <F12> <Esc>
+
vnoremap // y/\V<C-R>=escape(@",'/\')<CR><CR>
fun! SetupCommandAlias(from, to)
@@ -48,14 +56,7 @@
set viewoptions-=options
autocmd BufWinLeave ?* silent! mkview!
-function! s:loadViewOrUnfold()
- try
- loadview
- catch
- folddoclosed foldopen
- endtry
-endfunction
-
-autocmd BufWinEnter ?* call s:loadViewOrUnfold()
+set nofoldenable
+autocmd BufWinEnter ?* silent! loadview
tnoremap <Esc><Esc> <C-\><C-n>
diff --git a/modules/neovim/indentation/indentation.lua b/modules/neovim/indentation/indentation.lua
index 633aae5..42e960f 100644
--- a/modules/neovim/indentation/indentation.lua
+++ b/modules/neovim/indentation/indentation.lua
@@ -7,6 +7,10 @@
space_char_blankline = " ",
show_current_context = true,
show_current_context_start = true,
+ use_treesitter = true,
+ filetype_exclude = {
+ "markdown",
+ };
char_highlight_list = {
"IndentBlanklineIndent1",
"IndentBlanklineIndent2",
diff --git a/modules/neovim/markdown/markdown.vim b/modules/neovim/markdown/markdown.vim
index b5d629f..0ff94c1 100644
--- a/modules/neovim/markdown/markdown.vim
+++ b/modules/neovim/markdown/markdown.vim
@@ -1 +1,5 @@
-let g:vim_markdown_conceal_code_blocks = 0
+set conceallevel=2
+let g:vim_markdown_no_extensions_in_markdown = 1
+let g:vim_markdown_new_list_item_indent = 2
+let g:vim_markdown_autowrite = 1
+
diff --git a/modules/neovim/neoformat/default.nix b/modules/neovim/neoformat/default.nix
index c280010..2db4c6a 100644
--- a/modules/neovim/neoformat/default.nix
+++ b/modules/neovim/neoformat/default.nix
@@ -13,6 +13,7 @@
alejandra
rustfmt
shfmt
+ astyle
];
};
}
diff --git a/modules/neovim/theme/theme.vim b/modules/neovim/theme/theme.vim
index 6e0f29b..a77747d 100644
--- a/modules/neovim/theme/theme.vim
+++ b/modules/neovim/theme/theme.vim
@@ -9,10 +9,10 @@
exec ("highlight! " . a:group . " ctermfg=" . a:fg.cterm . " ctermbg=" . a:bg.cterm . " guifg=" . a:fg.gui . " guibg=" . a:bg.gui)
endfunction
-highlight Pmenu ctermfg=188 guifg=#dcdfe4 ctermbg=239 guibg=#474e5d
-highlight PmenuSel ctermfg=236 guifg=#282c34 ctermbg=75 guibg=#61afef
highlight PmenuSbar ctermfg=237 guifg=#313640 ctermbg=237 guibg=#313640
highlight PmenuThumb ctermfg=188 guifg=#dcdfe4 ctermbg=188 guibg=#dcdfe4
+call g:Highlight("PmenuSel", g:transparent, g:lightgrey)
+call g:Highlight("Pmenu", g:transparent, g:statusline)
call g:Highlight("HlSearchLens", g:darkyellow, g:transparent)
call g:Highlight("HlSearchLensNear", g:white, g:darkyellow)
diff --git a/modules/neovim/tree-sitter/default.nix b/modules/neovim/tree-sitter/default.nix
index 65355c0..b29a6aa 100644
--- a/modules/neovim/tree-sitter/default.nix
+++ b/modules/neovim/tree-sitter/default.nix
@@ -2,11 +2,18 @@
pkgs,
lib,
...
-}: {
+}: let
+ disabledGrammars = [
+ "tree-sitter-sql"
+ ];
+in {
programs.neovim = {
plugins = with pkgs.vimPlugins; [
(nvim-treesitter.withPlugins (plugins:
- (builtins.attrValues plugins)
+ (lib.pipe plugins [
+ (lib.filterAttrs (name: value: !builtins.elem name disabledGrammars))
+ builtins.attrValues
+ ])
++ (with pkgs.vimPlugins; [
nvim-ts-rainbow
])))
diff --git a/modules/neovim/tree-sitter/setup.lua b/modules/neovim/tree-sitter/setup.lua
index 20acd3b..1b5efbe 100644
--- a/modules/neovim/tree-sitter/setup.lua
+++ b/modules/neovim/tree-sitter/setup.lua
@@ -2,6 +2,7 @@
highlight = {
enable = true,
additional_vim_regex_highlighting = {'org'},
+ disable = {'sql', 'markdown'},
},
rainbow = {
enable = true,
@@ -23,6 +24,7 @@
"75",
"176",
},
+ disable = {'sql', 'markdown'},
},
incremental_selection = {
enable = true,
@@ -32,14 +34,17 @@
scope_incremental = "grc",
node_decremental = "grm",
},
+ disable = {'sql', 'markdown'},
},
indent = {
enable = true,
+ disable = {'sql', 'markdown'},
},
}
require('treesitter-context').setup{
enable = true,
+ disable = {'sql', 'markdown'},
trim_scope = 'outer',
patterns = {
default = {
diff --git a/modules/neovim/wiki/wiki.vim b/modules/neovim/wiki/wiki.vim
index ae2e2d7..a4f8f39 100644
--- a/modules/neovim/wiki/wiki.vim
+++ b/modules/neovim/wiki/wiki.vim
@@ -9,7 +9,7 @@
" If the file is new, then append the current date
return filereadable(l:name)
\ ? a:name
- \ : a:name . '_' . strftime('%Y%m%d')
+ \ : substitute(a:name, " ", "_", "g") . '_' . strftime('%Y%m%d')
endfunction
nnoremap <silent> <Leader>wf :WikiFzfPages<CR>