From 9f1466a8fb7c14a3d522d16f8accf6d4d47d440d Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Thu, 5 Sep 2019 11:49:18 -0400 Subject: use vim instead of nvim --- templates/.vimrc | 66 +++------------------------------------------- templates/.zsh/aliases.zsh | 2 +- templates/.zsh/env.zsh | 2 +- 3 files changed, 6 insertions(+), 64 deletions(-) (limited to 'templates') diff --git a/templates/.vimrc b/templates/.vimrc index 2cd28ab..91b5367 100644 --- a/templates/.vimrc +++ b/templates/.vimrc @@ -19,6 +19,7 @@ set path+=** set wildmenu set wildmode=longest,list,full set suffixesadd=.js,.ts +set hlsearch call plug#begin('~/.local/share/nvim/plugged') Plug 'PotatoesMaster/i3-vim-syntax' @@ -43,67 +44,6 @@ Plug 'vim-scripts/camelcasemotion' Plug 'vito-c/jq.vim' call plug#end() -" here is some stuff -hi! ColorColumn ctermfg=NONE ctermbg=DarkBlue cterm=NONE -hi! Comment ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! Conceal ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! Constant ctermfg=Cyan ctermbg=NONE cterm=NONE -hi! CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE -hi! CursorLine ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! CursorLineConceal ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! DiffAdd ctermfg=Black ctermbg=Yellow cterm=NONE -hi! DiffChange ctermfg=Blue ctermbg=Yellow cterm=NONE -hi! DiffText ctermfg=White ctermbg=Yellow cterm=NONE -hi! Directory ctermfg=Blue ctermbg=NONE cterm=NONE -hi! Error ctermfg=Black ctermbg=Red cterm=NONE -hi! ErrorMsg ctermfg=Black ctermbg=Red cterm=standout -hi! FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE -hi! Folded ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! Function ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! GitGutterAdd ctermfg=Cyan ctermbg=NONE cterm=NONE -hi! GitGutterChange ctermfg=Blue ctermbg=NONE cterm=NONE -hi! GitGutterChangeDelete ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! GitGutterDelete ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! Identifier ctermfg=Blue ctermbg=NONE cterm=NONE -hi! Ignore ctermfg=NONE ctermbg=NONE cterm=NONE -hi! LineNr ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! LongLineWarning ctermfg=NONE ctermbg=NONE cterm=underline -hi! MatchParen ctermfg=White ctermbg=NONE cterm=underline -hi! ModeMsg ctermfg=Cyan ctermbg=NONE cterm=NONE -hi! MoreMsg ctermfg=Cyan ctermbg=NONE cterm=NONE -hi! NonText ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! Normal ctermfg=White ctermbg=NONE term=NONE -hi! Operator ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! Pmenu ctermfg=Black ctermbg=Yellow cterm=NONE -hi! PmenuSel ctermfg=Black ctermbg=Yellow cterm=reverse -hi! PreProc ctermfg=Red ctermbg=NONE cterm=NONE -hi! Question ctermfg=Cyan ctermbg=NONE cterm=NONE -hi! Search ctermfg=Black ctermbg=Cyan cterm=NONE -hi! SignColumn ctermfg=NONE ctermbg=Yellow cterm=NONE -hi! Special ctermfg=Red ctermbg=NONE cterm=NONE -hi! SpecialKey ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! SpellBad ctermfg=Red ctermbg=NONE cterm=underline -hi! SpellCap ctermfg=Red ctermbg=NONE cterm=underline -hi! SpellLocal ctermfg=Yellow ctermbg=NONE cterm=underline -hi! SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline -hi! Statement ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! StatusLine ctermfg=Blue ctermbg=NONE cterm=bold -hi! StatusLineNC ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! String ctermfg=Cyan ctermbg=NONE cterm=NONE -hi! Structure ctermfg=Red ctermbg=NONE cterm=NONE -hi! TabLine ctermfg=DarkBlue ctermbg=Black cterm=NONE -hi! TabLineFill ctermfg=DarkBlue ctermbg=Black cterm=NONE -hi! Title ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! Todo ctermfg=Yellow ctermbg=NONE cterm=NONE -hi! Type ctermfg=Blue ctermbg=NONE cterm=NONE -hi! Underlined ctermfg=Blue ctermbg=NONE cterm=underline -hi! VertSplit ctermfg=DarkBlue ctermbg=NONE cterm=NONE -hi! Visual ctermfg=Black ctermbg=Yellow cterm=NONE -hi! WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE -hi! WildMenu ctermfg=Black ctermbg=Yellow cterm=NONE -hi! qfLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE - au FileType markdown setlocal spell tw=80 colorcolumn=81 nosmartindent au FileType gitcommit setlocal spell au FileType java setlocal errorformat=[ERROR]\ %f:[%l\\,%v]\ %m @@ -116,7 +56,7 @@ au BufWritePost $CONF_SOURCE/templates/* call ConfApply(expand('%:p')) function! ConfApply(name) let l:rel = substitute(a:name, "^".expand($CONF_SOURCE."/templates/"), "", "") - silent execute "!conf apply " . l:rel + silent execute "!conf apply " . l:rel | execute "redraw!" endfunction let g:colorizer_auto_filetype='' @@ -126,3 +66,5 @@ let g:go_info_mode='gopls' nnoremap :noh noremap ; : nmap :FZF +" temporary workaround for https://github.com/vim/vim/issues/4738 +nmap gx yiW:!open " & diff --git a/templates/.zsh/aliases.zsh b/templates/.zsh/aliases.zsh index f9207fa..774951e 100644 --- a/templates/.zsh/aliases.zsh +++ b/templates/.zsh/aliases.zsh @@ -35,7 +35,7 @@ alias dcd="docker-compose down" alias dcud="docker-compose up -d" # edit -alias e="nvim" +alias e="vim" # pass alias pc="pass --clip" diff --git a/templates/.zsh/env.zsh b/templates/.zsh/env.zsh index ab28046..7af9059 100644 --- a/templates/.zsh/env.zsh +++ b/templates/.zsh/env.zsh @@ -4,7 +4,7 @@ export PASSWORD_STORE_GENERATED_LENGTH=64 export GOPATH="$PROJECTS" export LSCOLORS="exfxcxdxbxegedabagacad" export CLICOLOR=true -export EDITOR=nvim +export EDITOR=vim export LICENSE_FULL_NAME="Ben Burwell" export WWW_HOME="https://duckduckgo.com/" export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow -g "!{.git,node_modules}/*" 2> /dev/null' -- cgit v1.2.3