summaryrefslogtreecommitdiffstats
path: root/.config/nvim
diff options
context:
space:
mode:
authorkrisdoodle45 <86745210+krisdoodle45@users.noreply.github.com>2022-02-17 18:13:14 +0100
committerGitHub <noreply@github.com>2022-02-17 18:13:14 +0100
commitc16d6fd3b04670b2ae1315cfbc5dd6b53d44d0c5 (patch)
tree21b640553e5efd77b05cb63dbb30496867ce224d /.config/nvim
parent9ad912fe4eaf8c1b9c844780829aaea693c1e6de (diff)
parent82b70e3a8e3aed45998c38024e8c3e16f9680cff (diff)
downloadeibhear-c16d6fd3b04670b2ae1315cfbc5dd6b53d44d0c5.tar.gz
eibhear-c16d6fd3b04670b2ae1315cfbc5dd6b53d44d0c5.tar.zst
eibhear-c16d6fd3b04670b2ae1315cfbc5dd6b53d44d0c5.zip
Merge branch 'LukeSmithxyz:master' into patch-4
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/init.vim10
1 files changed, 6 insertions, 4 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index f93eed4..09610fd 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -96,8 +96,8 @@ set noshowcmd
" Ensure files are read as what I want:
let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
- map <leader>v :VimwikiIndex
- let g:vimwiki_list = [{'path': '~/vimwiki', 'syntax': 'markdown', 'ext': '.md'}]
+ map <leader>v :VimwikiIndex<CR>
+ let g:vimwiki_list = [{'path': '~/.local/share/nvim/vimwiki', 'syntax': 'markdown', 'ext': '.md'}]
autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown
autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff
autocmd BufRead,BufNewFile *.tex set filetype=tex
@@ -111,10 +111,12 @@ set noshowcmd
autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
-" Automatically deletes all trailing whitespace and newlines at end of file on save.
+" Automatically deletes all trailing whitespace and newlines at end of file on save. & reset cursor position
+ autocmd BufWritePre * let currPos = getpos(".")
autocmd BufWritePre * %s/\s\+$//e
autocmd BufWritePre * %s/\n\+\%$//e
autocmd BufWritePre *.[ch] %s/\%$/\r/e
+ autocmd BufWritePre * cal cursor(currPos[1], currPos[2])
" When shortcut files are updated, renew bash and ranger configs with new material:
autocmd BufWritePost bm-files,bm-dirs !shortcuts
@@ -130,7 +132,7 @@ if &diff
endif
" Function for toggling the bottom statusbar:
-let s:hidden_all = 1
+let s:hidden_all = 0
function! ToggleHiddenAll()
if s:hidden_all == 0
let s:hidden_all = 1