Vim and zshrc config

2 files changed, 16 insertions, 5 deletions

diff --git a/vim/.vimrc b/vim/.vimrc
index 2104a5b..8e42bf6 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -25,7 +25,7 @@ set shellslash
     Plugin 'godlygeek/tabular'
 
     " Editor config
-    " Plugin 'editorconfig/editorconfig-vim'
+    Plugin 'sgur/vim-editorconfig'
 
     " Color theme
     " Plugin 'agude/vim-eldar'
@@ -56,7 +56,7 @@ set shellslash
 
 " Completion
     set completeopt+=menuone
-    set completeopt+=noselect
+    " set completeopt+=noselect
 
     if has('nvim')
         let g:echodoc#enable_at_startup = 1
@@ -72,6 +72,9 @@ set shellslash
     let g:lsp_textprop_enabled = 0
     let g:lsp_signs_enabled = 1
 
+    " Close completion window
+    autocmd CompleteDone * pclose
+
     " Setup lsp servers
     if executable('pyls')
         au User lsp_setup call lsp#register_server({
@@ -140,6 +143,9 @@ set shellslash
     set expandtab
     set colorcolumn=80
 
+    set autoindent
+    set smartindent
+
     " Show 5 lines above and below cursor
     set scrolloff=3
     set list
@@ -153,7 +159,7 @@ set shellslash
         set inccommand=split
     endif
 
-    set background=dark
+    set background=light
 
     set hidden
 
@@ -169,6 +175,9 @@ set shellslash
     " Exit insert mode on inactivity
     " au CursorHoldI * stopinsert
 
+" Formatting
+    autocmd FileType go Har vi ikke set noet
+
 " Vimwiki stuff
     let g:vimwiki_list = [{'path': '~/Documents/vimwiki', 'path_html': '~/Documents/vimwiki/export'}]
 
@@ -197,7 +206,6 @@ set shellslash
     set wildmenu
 
     let g:netrw_liststyle=2
-    let g:netrw_banner = 0
 
 " Keymapping
     " When moving more lines make it a jump. If couns i 2 it will run m'2j,
diff --git a/zsh/.zshrc b/zsh/.zshrc
index cbb4caf..7ae13be 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -80,15 +80,17 @@ bindkey "^[[1;5D" backward-word
 #
 export EDITOR=nvim
 export SUDO_EDITOR=$EDITOR
-export LANG=en_US.UTF-8
+# export LANG=en_US.UTF-8
 export TERM="xterm-256color"
 export PATH=$PATH:$HOME/Scripts/bin
+export PATH=$PATH:$HOME/go/bin
 
 #
 # Alias
 #
 alias vim="nvim"
 alias ls='ls --color=auto'
+alias etckeep="/usr/bin/git --git-dir=/etc/.git --work-tree=/etc/"
 
 #
 # Functions
@@ -118,6 +120,7 @@ function goto {
     $HOME/Scripts/goto $@
     if [ $? -eq 3 ]; then
         cd $(</tmp/where)
+        echo cd $(</tmp/where)
     fi
 }