From 724a3e08f6ea1d5389d9b7bbe7c9fe50a18a7609 Mon Sep 17 00:00:00 2001 From: AdeAttwood Date: Sun, 24 Jul 2016 07:10:50 +0100 Subject: [PATCH] update color theme and some things in the vimrc --- dotfiles/Xresources | 95 ++++++++++++++++++++-------------------- dotfiles/bashrc | 28 +++++++++++- dotfiles/tmux.conf | 103 ++++++++++++++++++++++++++++++++++++++++++++ dotfiles/vimrc | 76 ++++++++++++++++++-------------- 4 files changed, 219 insertions(+), 83 deletions(-) diff --git a/dotfiles/Xresources b/dotfiles/Xresources index 9899c1a..500390a 100644 --- a/dotfiles/Xresources +++ b/dotfiles/Xresources @@ -13,58 +13,55 @@ xterm*savelines: 16384 ! double-click to select whole URLs :D xterm*charClass: 33:48,36-47:48,58-59:48,61:48,63-64:48,95:48,126:48 +xterm*termName: xterm-256color +! Base16 Railscasts +! Scheme: Ryan Bates (http://railscasts.com) -! DOS-box colours... +#define base00 #2b2b2b +#define base01 #272935 +#define base02 #3a4055 +#define base03 #5a647e +#define base04 #d4cfc9 +#define base05 #e6e1dc +#define base06 #f4f1ed +#define base07 #f9f7f3 +#define base08 #da4939 +#define base09 #cc7833 +#define base0A #ffc66d +#define base0B #a5c261 +#define base0C #519f50 +#define base0D #6d9cbe +#define base0E #b6b3eb +#define base0F #bc9458 +*.foreground: base05 +*.background: base00 +*.cursorColor: base05 -! right hand side scrollbar... -xterm*rightScrollBar: true -xterm*ScrollBar: true +*.color0: base00 +*.color1: base08 +*.color2: base0B +*.color3: base0A +*.color4: base0D +*.color5: base0E +*.color6: base0C +*.color7: base05 -! stop output to terminal from jumping down to bottom of scroll again -xterm*scrollTtyOutput: false +*.color8: base03 +*.color9: base08 +*.color10: base0B +*.color11: base0A +*.color12: base0D +*.color13: base0E +*.color14: base0C +*.color15: base07 -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - -*background: S_base03 -*foreground: S_base0 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground:S_base01 -*pointerColorForeground:S_base1 - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - -xterm*foreground: S_base0 -xterm*background: S_base03 -xterm*color0: S_base02 -xterm*color1: S_red -xterm*color2: S_green -xterm*color3: S_yellow -xterm*color4: S_blue -xterm*color5: S_magenta -xterm*color6: S_cyan -xterm*color7: S_base2 -xterm*color8: S_base03 -xterm*color9: S_orange -xterm*color10: S_base01 -xterm*color11: S_base00 -xterm*color12: S_base0 -xterm*color13: S_violet -xterm*color14: S_base1 -xterm*color15: S_base3 +! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! use 'shell' template to set these if necessary +*.color16: base09 +*.color17: base0F +*.color18: base01 +*.color19: base02 +*.color20: base04 +*.color21: base06 diff --git a/dotfiles/bashrc b/dotfiles/bashrc index 4340756..efb7548 100644 --- a/dotfiles/bashrc +++ b/dotfiles/bashrc @@ -46,7 +46,7 @@ esac # uncomment for a colored prompt, if the terminal has the capability; turned # 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 if [ -n "$force_color_prompt" ]; then if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then @@ -118,3 +118,29 @@ if ! shopt -oq posix; then . /etc/bash_completion fi fi + + +export PHPBREW_SET_PROMPT=1 +source "$HOME/.phpbrew/bashrc" + +export PATH="$HOME/.rbenv/bin:$PATH" +eval "$(rbenv init -)" +export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH" + + +export base00="#2b303b" +export base01="#343d46" +export base02="#4f5b66" +export base03="#65737e" +export base04="#a7adba" +export base05="#c0c5ce" +export base06="#dfe1e8" +export base07="#eff1f5" +export base08="#bf616a" +export base09="#d08770" +export base0A="#ebcb8b" +export base0B="#a3be8c" +export base0C="#96b5b4" +export base0D="#8fa1b3" +export base0E="#b48ead" +export base0F="#ab7967" diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf index ef5fff7..566a143 100644 --- a/dotfiles/tmux.conf +++ b/dotfiles/tmux.conf @@ -26,3 +26,106 @@ bind : command-prompt # vi-style controls for copy mode setw -g mode-keys vi + +# set 256 color to use color scheme +set -g default-terminal "xterm-256color" +set -g terminal-overrides 'xteram*:colors=256' + +###################### +### DESIGN CHANGES ### +###################### + +# panes +set -g pane-border-fg black +set -g pane-active-border-fg brightred + +## Status bar design +# status line +set -g status-utf8 on +set -g status-justify left +set -g status-bg default +set -g status-fg colour12 +set -g status-interval 2 + +# messaging +set -g message-fg black +set -g message-bg yellow +set -g message-command-fg blue +set -g message-command-bg black + +#window mode +setw -g mode-bg colour6 +setw -g mode-fg colour0 + +# window status +setw -g window-status-format " #F#I:#W#F " +setw -g window-status-current-format " #F#I:#W#F " +setw -g window-status-format "#[fg=magenta]#[bg=black] #I #[bg=cyan]#[fg=colour8] #W " +setw -g window-status-current-format "#[bg=brightmagenta]#[fg=colour8] #I #[fg=colour8]#[bg=colour14] #W " +setw -g window-status-current-bg colour0 +setw -g window-status-current-fg colour11 +setw -g window-status-current-attr dim +setw -g window-status-bg green +setw -g window-status-fg black +setw -g window-status-attr reverse + +# Info on left (I don't have a session display for now) +set -g status-left '' + +# loud or quiet? +set-option -g visual-activity off +set-option -g visual-bell off +set-option -g visual-silence off +set-window-option -g monitor-activity off +set-option -g bell-action none + +#set -g default-terminal "screen-256color" + +# The modes { +setw -g clock-mode-colour colour135 +setw -g mode-attr bold +setw -g mode-fg colour196 +setw -g mode-bg colour238 + +# } +# The panes { + +set -g pane-border-bg colour235 +set -g pane-border-fg colour238 +set -g pane-active-border-bg colour236 +set -g pane-active-border-fg colour51 + +# } +# The statusbar { + +set -g status-position bottom +set -g status-bg colour234 +set -g status-fg colour137 +set -g status-attr dim +set -g status-left '' +set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S ' +set -g status-right-length 50 +set -g status-left-length 20 + +setw -g window-status-current-fg colour81 +setw -g window-status-current-bg colour238 +setw -g window-status-current-attr bold +setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' + +setw -g window-status-fg colour138 +setw -g window-status-bg colour235 +setw -g window-status-attr none +setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' + +setw -g window-status-bell-attr bold +setw -g window-status-bell-fg colour255 +setw -g window-status-bell-bg colour1 + +# } +# The messages { + +set -g message-attr bold +set -g message-fg colour232 +set -g message-bg colour166 + +# } diff --git a/dotfiles/vimrc b/dotfiles/vimrc index 4da08c0..ce94426 100644 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -1,31 +1,16 @@ -" -------------------------------------------------------------------------------- + " important " -------------------------------------------------------------------------------- call pathogen#infect() set nocompatible set runtimepath^=~/.vim/bundle/ctrlp.vim +filetype plugin on +set t_Co=256 " -------------------------------------------------------------------------------- " not sorted " -------------------------------------------------------------------------------- -let g:airline#extensions#branch#enabled=1 - -set t_Co=256 -set fileencoding=utf-8 -set encoding=utf-8 -set title -set autoread -set matchpairs+=<:> -set ruler -set showcmd -set cursorline - - -let g:pdv_template_dir = $HOME ."/.vim/bundle/pdv/templates_snip" -let g:indent_guides_auto_colors = 1 -"autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=red ctermbg=3 -"autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=green ctermbg=4 " -------------------------------------------------------------------------------- -" moving around, searching and patterns + " -------------------------------------------------------------------------------- set showmatch set incsearch @@ -37,9 +22,13 @@ set hlsearch " displaying text " -------------------------------------------------------------------------------- set linebreak +set nowrap +set nu +set rnu " -------------------------------------------------------------------------------- " highlighting and spelling " -------------------------------------------------------------------------------- +set cursorline " -------------------------------------------------------------------------------- " multiple windows " -------------------------------------------------------------------------------- @@ -50,6 +39,7 @@ set laststatus=2 " -------------------------------------------------------------------------------- " terminal " -------------------------------------------------------------------------------- +set title " -------------------------------------------------------------------------------- " using the mouse " -------------------------------------------------------------------------------- @@ -60,12 +50,15 @@ set mouse=a " -------------------------------------------------------------------------------- " messages and info " -------------------------------------------------------------------------------- +set ruler +set showcmd " -------------------------------------------------------------------------------- " selecting text " -------------------------------------------------------------------------------- " -------------------------------------------------------------------------------- " editing text " -------------------------------------------------------------------------------- +set matchpairs+=<:> " -------------------------------------------------------------------------------- " tabs and indenting " -------------------------------------------------------------------------------- @@ -77,6 +70,10 @@ filetype plugin indent on " -------------------------------------------------------------------------------- " folding " -------------------------------------------------------------------------------- +set foldmethod=indent +set foldlevel=1 +set foldnestmax=2 +"set nofen " -------------------------------------------------------------------------------- " diff mode " -------------------------------------------------------------------------------- @@ -100,6 +97,7 @@ nnoremap tf :! vendor/bin/phpunit % " -------------------------------------------------------------------------------- " reading and writing files " -------------------------------------------------------------------------------- +set autoread " -------------------------------------------------------------------------------- " the swap file " -------------------------------------------------------------------------------- @@ -119,27 +117,21 @@ set noswapfile " -------------------------------------------------------------------------------- " multi-byte characters " -------------------------------------------------------------------------------- +set fileencoding=utf-8 +set encoding=utf-8 " -------------------------------------------------------------------------------- " variousexecute " -------------------------------------------------------------------------------- " -------------------------------------------------------------------------------- -" functions +" plugins " -------------------------------------------------------------------------------- -set rnu -function! ToggleNumbersOn() - set nu! - set rnu -endfunction -function! ToggleRelativeOn() - set rnu! - set nu -endfunction -autocmd FocusLost * call ToggleRelativeOn() -autocmd FocusGained * call ToggleRelativeOn() -autocmd InsertEnter * call ToggleRelativeOn() -autocmd InsertLeave * call ToggleRelativeOn() +" ultisnips +let g:UltiSnipsSnippetsDir = "~/.vim/UltiSnips" +let g:snips_author = "AdeAttwood" +let g:snips_email = "attwood16@gmail.com" +" vimwiki let g:vimwiki_list = [{ \ 'path': '$HOME/ownCloud/vimwiki/', \ 'template_path': '$HOME/ownCloud/vimwiki/templates', @@ -163,3 +155,21 @@ function! ToggleCalendar() endfunction autocmd FileType calendar nmap :call vimwiki#diary#calendar_action(b:calendar.day().get_day(), b:calendar.day().get_month(), b:calendar.day().get_year(), b:calendar.day().week(), "V") + +" vim-airline +let g:airline#extensions#branch#enabled=1 + +" browserlink +let g:bl_pagefiletype = ['html', 'javascript', 'css', 'scss', 'sass', 'php', 'phtml'] + +" pdv +let g:pdv_template_dir = $HOME ."/.vim/bundle/pdv/templates_snip" + +" indent-guides +let g:indent_guides_auto_colors = 1 +" -------------------------------------------------------------------------------- +" functions +" -------------------------------------------------------------------------------- + + +