summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vim/.vimrc16
-rw-r--r--zsh/.zshrc1
2 files changed, 16 insertions, 1 deletions
diff --git a/vim/.vimrc b/vim/.vimrc
index 62f590b..82e56a1 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -72,10 +72,11 @@ if has("nvim") && hostname() != "peuplier"
endif
" Colors
-Plug 'altercation/vim-colors-solarized'
+Plug 'lifepillar/vim-solarized8'
Plug 'junegunn/seoul256.vim'
Plug 'romainl/Apprentice'
Plug 'JuliaEditorSupport/julia-vim'
+Plug 'arcticicestudio/nord-vim'
" Plug 'axvr/zepl.vim'
call plug#end()
@@ -394,9 +395,20 @@ augroup END
"" Colorscheme {{{1
nnoremap ,cd :colorscheme darjeeling<cr>
nnoremap ,cs :colorscheme seoul256<cr>
+
set notermguicolors
colo darjeeling
+" set termguicolors
+" colo nord
+" highlight Comment ctermfg=66 guifg=#5f8787
+" highlight SignColumn ctermbg=234 ctermfg=232 guibg=#1c1c1c guifg=#080808
+
+
+
+" set notermguicolors
+" colo darjeeling
+
"" Neovim {{{1
if has("nvim")
nnoremap goh :let @a=getcwd() \| lcd %:h \| terminal<cr>:execute 'lcd '.@a<cr>A
@@ -463,3 +475,5 @@ function! Get_surrounding()
return env
endif
endfunction
+
+" vim: nospell
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5003c37..abb89dc 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -111,6 +111,7 @@ alias ga='git add'
alias gc='git commit'
alias gco='git checkout'
alias gd='git diff'
+alias glog='git log --oneline --decorate --graph --all'
alias gl='git pull'
alias gp='git push'
alias gr='git remote'