diff --git a/bashrc b/bashrc index 11270c8..9a03066 100644 --- a/bashrc +++ b/bashrc @@ -71,15 +71,7 @@ stty -ixon # disable ^S/^Q flow control # # colors -# -if [[ "$OSTYPE" == "darwin"* ]] || [[ "$OSTYPE" == "sun"* ]] ; then - # BSD/macOS - export LS_COLORS='ExGxbEaECxxEhEhBaDaCaD' - -else - # Linux - export LS_COLORS='di=36:ln=35:su=31;47:sg=35;47' -fi +# export GREP_COLOR='mt=1;36' export LESS="-R" # less colored output export LESS_TERMCAP_mb=$'\E[01;31m' # begin blinking @@ -89,6 +81,15 @@ export LESS_TERMCAP_se=$'\E[0m' # end standout-mode export LESS_TERMCAP_so=$'\E[38;5;246m' # begin standout-mode - info box export LESS_TERMCAP_ue=$'\E[0m' # end underline export LESS_TERMCAP_us=$'\E[04;38;5;146m' # begin underline +# dir colors (https://geoff.greer.fm/lscolors/) +if [[ "$OSTYPE" == "darwin"* ]] || [[ "$OSTYPE" == "sun"* ]] ; then + # BSD/macOS + export LS_COLORS='ExGxbEaECxxEhEhBaDaCaD' + +else + # Linux + export LS_COLORS='di=36:ln=35:su=31;47:sg=35;47' +fi # @@ -176,7 +177,7 @@ PS1+='\[${PROMPT_COLORS[3]}\]\h ' # PS1+='\[${COLOR256[0]}\]\[${COLOR256[257]}\]'"$(zonename 2>/dev/null | grep -q '^global$' && echo 'GZ:')"'\[${COLOR256[256]}\]' # uname -#PS1+='\[${PROMPT_COLORS[2]}\]'"$(uname | tr '[:upper:]' '[:lower:]')"' ' +# PS1+='\[${PROMPT_COLORS[2]}\]'"$(uname | tr '[:upper:]' '[:lower:]')"' ' # cwd PS1+='\[${PROMPT_COLORS[5]}\]\w ' diff --git a/vimrc b/vimrc index 31fd659..65273af 100644 --- a/vimrc +++ b/vimrc @@ -25,7 +25,7 @@ nmap gd :ALEGoToDefinition nmap gr :ALEFindReferences let g:ale_sign_column_always=1 let g:ale_change_sign_column_color=1 -:highlight SignColumn ctermbg=238 +dfd:highlight SignColumn ctermbg=238 set laststatus=2 set paste "colorscheme google @@ -34,3 +34,8 @@ set paste "colorscheme madeofcode "colorscheme h80 colorscheme badwolf + +" Remember cursor position +if has("autocmd") + au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | execute "normal! g`\"" | endif +endif