vim zsh

This commit is contained in:
Jan Andrle 2024-05-19 00:07:36 +02:00
parent e9e415d818
commit ed31cb3c13
2 changed files with 192 additions and 169 deletions

8
.vimrc
View File

@ -23,7 +23,6 @@ nnoremap <leader>A @@
nnoremap <leader>u U nnoremap <leader>u U
nnoremap U <c-r> nnoremap U <c-r>
nnoremap <leader>l <c-]> nnoremap <leader>l <c-]>
nmap <silent><leader>m :nohlsearch<bar>diffupdate<cr>
nnoremap <leader>o o<space><bs><esc> nnoremap <leader>o o<space><bs><esc>
nnoremap <leader>O O<space><bs><esc> nnoremap <leader>O O<space><bs><esc>
@ -42,7 +41,9 @@ set breakindent breakindentopt=shift:2 showbreak=↳
set scrolloff=5 sidescrolloff=10 " offset for lines/columns when scrolling set scrolloff=5 sidescrolloff=10 " offset for lines/columns when scrolling
set autowrite autoread | autocmd FocusGained,BufEnter *.* checktime set autowrite autoread | autocmd FocusGained,BufEnter *.* checktime
set modeline set modeline
set hlsearch incsearch set hlsearch incsearch " highlight search, start when typing
if maparg('<C-L>', 'n') ==# ''
nnoremap <silent> <c-l> :nohlsearch<c-r>=has('diff')?'<bar>diffupdate':''<cr><cr><c-l> | endif
set smarttab set smarttab
command! -nargs=1 SETtab let &shiftwidth=<q-args> | let &tabstop=<q-args> | let &softtabstop=<q-args> command! -nargs=1 SETtab let &shiftwidth=<q-args> | let &tabstop=<q-args> | let &softtabstop=<q-args>
SETtab 4 SETtab 4
@ -56,8 +57,9 @@ if (&t_Co > 2 || has("gui_running")) && !exists("syntax_on")
set list listchars=tab:»·,trail,extends:#,nbsp:~,space set list listchars=tab:»·,trail,extends:#,nbsp:~,space
augroup syntax_sync_min_lines augroup syntax_sync_min_lines
autocmd! autocmd!
autocmd Syntax * syn sync minlines=200 autocmd Syntax * syn sync minlines=20000
augroup END augroup END
set re=0
command! -nargs=? SETspell if <q-args>==&spelllang || <q-args>=='' | set spell! | else | set spell | set spelllang=<args> | endif | if &spell | set spelllang | endif command! -nargs=? SETspell if <q-args>==&spelllang || <q-args>=='' | set spell! | else | set spell | set spelllang=<args> | endif | if &spell | set spelllang | endif
command! -nargs=0 SETFOLDregions set foldmethod=marker command! -nargs=0 SETFOLDregions set foldmethod=marker

21
.zshrc
View File

@ -204,6 +204,27 @@ if [ "$funcstack[1]" = "_devbox" ]; then
_devbox _devbox
fi fi
# activate gls colors
export ZSH_DIRCOLORS="$ZSH_CONFIG/dircolors-solarized/dircolors.256dark"
if [[ -a $ZSH_DIRCOLORS ]]; then
if [[ "$TERM" == *256* ]]; then
which gdircolors > /dev/null && eval "`gdircolors -b $ZSH_DIRCOLORS`"
else
# standard colors for non-256-color terms
which gdircolors > /dev/null && eval "`gdircolors -b`"
fi
else
which gdircolors > /dev/null && eval "`gdircolors -b`"
fi
export CLICOLOR=1
export LSCOLORS=ExGxBxDxCxEgEdxbxgxcxd
alias myls='ls -pFhA'
alias myrm='rm -vi'
alias mycp='cp -vi'
alias mymv='mv -vi'
alias mydf='df -Th'
alias myless='less -R -S'
export PATH="$HOME/.jenv/bin:$PATH" export PATH="$HOME/.jenv/bin:$PATH"
eval "$(jenv init -)" eval "$(jenv init -)"
export ANDROID_HOME=$HOME/Library/Android/sdk && export PATH=$PATH:$ANDROID_HOME/emulator && export PATH=$PATH:$ANDROID_HOME/platform-tools export ANDROID_HOME=$HOME/Library/Android/sdk && export PATH=$PATH:$ANDROID_HOME/emulator && export PATH=$PATH:$ANDROID_HOME/platform-tools