diff --git a/.bash_exports b/.bash_exports index b55d0ea..16c9998 100644 --- a/.bash_exports +++ b/.bash_exports @@ -62,6 +62,8 @@ export RUST_SRC_PATH=$HOME/src/github.com/rust-lang/rust/src ## grep export GREP_COLOR='38;5;232;48;5;214;1' +export TERM=st-256color + if [ "$TERM" != "dumb" ]; then if [ -x /usr/bin/pygmentize ]; then export LESSOPEN="|/usr/bin/pygmentize -f terminal256 -O style=tango %s" diff --git a/.bash_prompt b/.bash_prompt index 23d0f6f..afb9b7f 100644 --- a/.bash_prompt +++ b/.bash_prompt @@ -57,7 +57,7 @@ fi PS1_ROOT="\[\e[38;5;228;48;5;196m\] ### ROOT ### " case "$TERM" in - putty|putty*|xterm|xterm*|screen|screen.xterm|screen-bce|rxvt|rxvt-unicode) + putty|putty*|xterm|xterm*|screen|screen.xterm|screen-bce|rxvt|rxvt-unicode|st|st-*) PS1="\[\e[1${PS1_EXTRA}m\]\$(__git_ps1 2>/dev/null)\$([ "\$USER" = "root" ] && echo -e \"$PS1_ROOT\") ${PS1_PREFIX}\W\\$\[\e[0m\]${PS1_TITLE} " ;; *) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 9bca797..1fe4f50 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -20,10 +20,12 @@ Plugin 'Matt-Deacalion/vim-systemd-syntax' Plugin 'nanotech/jellybeans.vim' Plugin 'NLKNguyen/papercolor-theme' Plugin 'plasticboy/vim-markdown' +Plugin 'rakr/vim-one' Plugin 'rust-lang/rust.vim' Plugin 'scrooloose/syntastic' Plugin 'tomtom/tcomment_vim' Plugin 'tpope/vim-fugitive' +Plugin 'tyrannicaltoucan/vim-quantum' Plugin 'Valloric/YouCompleteMe' call vundle#end() @@ -324,6 +326,7 @@ map ,h :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" set background=dark +let g:one_allow_italics=1 let g:PaperColor_Light_Override = { 'Background' : '#fefe00' } let g:lightline = { @@ -407,6 +410,14 @@ set statusline+=%#warningmsg# set statusline+=%{SyntasticStatuslineFlag()} set statusline+=%* +" Golang +let g:go_highlight_functions = 1 +let g:go_highlight_methods = 1 +let g:go_highlight_structs = 1 +let g:go_highlight_interfaces = 1 +let g:go_highlight_operators = 1 +let g:go_highlight_build_constraints = 1 + " Hugo let g:vim_markdown_frontmatter = 1 let g:vim_markdown_toml_frontmatter = 1 @@ -431,8 +442,26 @@ let g:jellybeans_overrides = { \ 'Visual': { 'ctermbg': '220' }, \} +"Credit joshdick +"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux. +"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support +"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.) +if (empty($TMUX)) + if (has("nvim")) + "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 > + let $NVIM_TUI_ENABLE_TRUE_COLOR=1 + endif + "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 > + "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd > + " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 > + if (has("termguicolors")) + set termguicolors + endif +endif + " color dln-light color jellybeans +" color one highlight LineNr ctermfg=236 ctermbg=234 highlight CursorLine ctermfg=159 ctermbg=24 diff --git a/.tmux.conf b/.tmux.conf index 842f915..da80a98 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -7,7 +7,9 @@ set -s escape-time 50 set -g status-interval 60 set -g terminal-overrides "xterm*:XT:smcup@:rmcup@:kUP5=\eOA:kDN5=\eOB:kLFT5=\eOD:kRIT5=\eOC" set -g terminal-overrides ",*:colors=256:smso=\e[3m:rmso=\e[23m:sitm=\e[3m:ritm=\e[23m" -set -g default-terminal "xterm-256color" +set -g terminal-overrides ",xterm-256color:Tc" +set -g terminal-overrides ",st-256color:Tc" +set -g default-terminal "st-256color" set-option -g mouse #bind -n WheelUpPane copy-mode