summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian T <julian@jtle.dk>2021-09-01 18:22:52 +0200
committerJulian T <julian@jtle.dk>2021-09-01 18:22:52 +0200
commit2aba5ea0a97b02681078dc8816cbb3c800a480ac (patch)
tree44206863147a02f320296dfedfecdea1981bee20
parent51abd3b75cf325ee54b87fbe2bf5e3cf59169455 (diff)
Vim config changes
-rw-r--r--vim-core/.config/nvim/init.vim7
-rw-r--r--vim-extra/.config/nvim/extra.vim4
2 files changed, 4 insertions, 7 deletions
diff --git a/vim-core/.config/nvim/init.vim b/vim-core/.config/nvim/init.vim
index 0753756..9f992f8 100644
--- a/vim-core/.config/nvim/init.vim
+++ b/vim-core/.config/nvim/init.vim
@@ -70,7 +70,7 @@ filetype plugin indent on " required
" Language specific{{{
autocmd FileType python set et
autocmd FileType go setlocal noet
- autocmd FileType nix setlocal shiftwidth=4
+ autocmd FileType nix setlocal shiftwidth=4 softtabstop=4
autocmd FileType vim setlocal foldmethod=marker"}}}
" File management{{{
@@ -90,10 +90,7 @@ filetype plugin indent on " required
nnoremap <expr> k (v:count > 1 ? "m'" . v:count : '' ) . 'k'
" Leader stuff
- let mapleader=" "
-
- map <leader>mm :make V=1<CR>
- map <leader>mf :make flash V=1<CR>"}}}
+ let mapleader="\<Space>"
" Enforcing filetypes{{{
autocmd BufRead,BufNewFile *.ino set filetype=c
diff --git a/vim-extra/.config/nvim/extra.vim b/vim-extra/.config/nvim/extra.vim
index 4ff2c93..e0af79b 100644
--- a/vim-extra/.config/nvim/extra.vim
+++ b/vim-extra/.config/nvim/extra.vim
@@ -1,7 +1,7 @@
" Plugins{{{
" set the runtime path to include Vundle and initialize
- set rtp+=~/.config/nvim/bundle/Vundle.vim
- call vundle#begin("~/.config/nvim/bundle")
+ set rtp+=~/.vim/bundle/Vundle.vim
+ call vundle#begin("~/.vim/bundle")
" alternatively, pass a path where Vundle should install plugins
"call vundle#begin('~/some/path/here')