tweaks tweaks tweaks

master
Jordan Orelli 4 years ago
parent ce79034efc
commit 8ab3e68fc3

@ -21,15 +21,19 @@ shopt -s checkwinsize
# set a fancy prompt (non-color, unless we know we "want" color) # set a fancy prompt (non-color, unless we know we "want" color)
case "$TERM" in case "$TERM" in
xterm-color) color_prompt=yes;; xterm-color|*-256color)
color_prompt=yes
;;
xterm-kitty)
# the kitty docs recommend not changing the TERM value, so, we'll try
# that until it breaks.
color_prompt=yes
;;
esac esac
# uncomment for a colored prompt, if the terminal has the capability; turned # uncomment for a colored prompt, if the terminal has the capability
# off by default to not distract the user: the focus in a terminal window
# should be on the output of commands, not on the prompt
force_color_prompt=yes force_color_prompt=yes
#unset color_prompt force_color_prompt
export PS1="\[\e[0;32m\]\u@\h[\j] \w: \[\e[m\]" export PS1="\[\e[0;32m\]\u@\h[\j] \w: \[\e[m\]"
export EDITOR=vim export EDITOR=vim
@ -39,6 +43,9 @@ Darwin)
echo "Using OSX bash settings." echo "Using OSX bash settings."
alias ls="ls -G" alias ls="ls -G"
;; ;;
Linux)
# for some reason I find this welcome string more annoying on Linux
;;
*) *)
echo "No platform-specific bash settings are enabled." echo "No platform-specific bash settings are enabled."
;; ;;

@ -3,12 +3,12 @@ set nocompatible
" Plugins -------------------------------------------------------------------{{{ " Plugins -------------------------------------------------------------------{{{
" set the runtime path to include Vundle and initialize " set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin() call vundle#begin()
" let Vundle manage Vundle, required " let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim' Plugin 'VundleVim/Vundle.vim'
" Plugin 'ycm-core/YouCompleteMe' " Plugin 'ycm-core/YouCompleteMe'
Plugin 'neoclide/coc.nvim'
Plugin 'tpope/vim-fugitive' Plugin 'tpope/vim-fugitive'
Plugin 'tpope/vim-surround' Plugin 'tpope/vim-surround'
Plugin 'tpope/vim-rails' Plugin 'tpope/vim-rails'
@ -39,6 +39,9 @@ call vundle#begin()
" "
" I just don't like it any more " I just don't like it any more
" Plugin 'airblade/vim-gitgutter' " Plugin 'airblade/vim-gitgutter'
"
" Still figuring this one out. I think I hate it?
" Plugin 'neoclide/coc.nvim'
call vundle#end() " required call vundle#end() " required
" enable the filetype plugin " enable the filetype plugin
@ -154,11 +157,6 @@ if &t_Co > 2 || has("gui_running")
" from our colorscheme instead of from the terminal default " from our colorscheme instead of from the terminal default
if (&term =~ '^xterm') if (&term =~ '^xterm')
set t_ut= | set ttyscroll=1 set t_ut= | set ttyscroll=1
" let &t_ZH="\e[3m"
" let &t_ZR="\e[23m"
" set t_ZH=
" set t_ZR=
endif endif
" this should not do anything but it does. " this should not do anything but it does.
@ -171,10 +169,7 @@ if &t_Co > 2 || has("gui_running")
catch catch
silent! colorscheme delek silent! colorscheme delek
endtry endtry
endif endif
" ---------------------------------------------------------------------------}}} " ---------------------------------------------------------------------------}}}
" Autocmd Hooks -------------------------------------------------------------{{{ " Autocmd Hooks -------------------------------------------------------------{{{

Loading…
Cancel
Save