all: simplify and prettify

This commit is contained in:
2019-03-12 12:39:47 +01:00
parent 15bae882c9
commit 33b0eed38a
2 changed files with 3 additions and 30 deletions

28
vimrc
View File

@@ -154,14 +154,6 @@ nnoremap <leader>mo :set mouse=<cr>
set mouse=a set mouse=a
" }}} " }}}
" Colors and Fonts {{{
Bundle 'vim-scripts/wombat256.vim'
try
colorscheme desert
catch
endtry
" Enable syntax highlighting " Enable syntax highlighting
syntax enable syntax enable
@@ -170,20 +162,10 @@ hi! link SignColumn LineNr
hi! link SyntasticErrorSign ErrorMsg hi! link SyntasticErrorSign ErrorMsg
hi! link SyntasticWarningSign WarningMsg hi! link SyntasticWarningSign WarningMsg
" Use pleasant but very visible search hilighting
hi Search ctermfg=white ctermbg=173 cterm=none guifg=#ffffff guibg=#e5786d gui=none
hi! link Visual Search
" Enable filetype plugins " Enable filetype plugins
filetype plugin on filetype plugin on
filetype indent on filetype indent on
" Match wombat colors in nerd tree
hi Directory guifg=#8ac6f2
" Searing red very visible cursor
hi Cursor guibg=red
" Use same color behind concealed unicode characters " Use same color behind concealed unicode characters
hi clear Conceal hi clear Conceal
@@ -191,16 +173,6 @@ hi clear Conceal
set paste set paste
set clipboard=unnamed set clipboard=unnamed
" Don't blink normal mode cursor
set guicursor=n-v-c:block-Cursor
set guicursor+=n-v-c:blinkon0
" Set extra options when running in GUI mode
if has("gui_running")
set guioptions-=T
set guioptions-=e
set guitablabel=%M\ %t
endif
set t_Co=256 set t_Co=256
" Set utf8 as standard encoding and en_US as the standard language " Set utf8 as standard encoding and en_US as the standard language

5
zshrc
View File

@@ -38,6 +38,7 @@ export CARP_DIR=$GH_HOME/carp/Carp/
export EDITOR=/usr/local/bin/vim export EDITOR=/usr/local/bin/vim
alias dob="git branch --merged | grep -vE '(\*)|(master)|(dev)' | xargs -n 1 git branch -d" alias dob="git branch --merged | grep -vE '(\*)|(master)|(dev)' | xargs -n 1 git branch -d"
alias vi="stty stop '' -ixoff ; stty erase '^?'; vim" alias vi="stty stop '' -ixoff ; stty erase '^?'; vim"
alias em="/usr/local/bin/emacs"
alias mk="make" alias mk="make"
alias g="git" alias g="git"
alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py" alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py"
@@ -57,7 +58,7 @@ alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo
alias loc="cloc --read-lang-def=/Users/veitheller/.scripts/cloc.txt *" alias loc="cloc --read-lang-def=/Users/veitheller/.scripts/cloc.txt *"
alias ls="ls -a" alias ls="ls -a"
alias pbclear="echo -n '' | pbcopy" alias pbclear="echo -n '' | pbcopy"
PROMPT="%{$fg[red]%}%n%{$fg[white]%} at %{$fg[green]%}%m%{$fg[white]%}"$'\n'"=> " PROMPT="%{$fg[red]%}%n%{$reset_color%} at %{$fg[green]%}%m%{$reset_color%}"$'\n'"=> "
expand-or-complete-with-dots(){ expand-or-complete-with-dots(){
echo -n "e[31m.....\e[0m" echo -n "e[31m.....\e[0m"
@@ -108,7 +109,7 @@ function rprompt-git-current-branch {
} }
RPROMPT='`rprompt-git-current-branch`' RPROMPT='`rprompt-git-current-branch`'
RPROMPT+="%{$fg[white]%}in %{$fg[yellow]%}%~%{$reset_color%}" RPROMPT+="%{$reset_color%}in %{$fg[yellow]%}%~%{$reset_color%}"
save_dotfiles(){ save_dotfiles(){
local DOTPATH=~/Documents/Code/Github/.dotfiles/ local DOTPATH=~/Documents/Code/Github/.dotfiles/