1
0
Fork 0

Revert "gotham theme for everything + theme agnostic tmux config"

This reverts commit a2216466c1.

Because gotham theme may be nice, but there's too much contrast and my
eyes are bleeding now.
This commit is contained in:
Von Random 2015-04-06 21:52:37 +03:00
parent a2216466c1
commit 4af00e1ee3
4 changed files with 65 additions and 98 deletions

18
shellrc
View file

@ -28,7 +28,7 @@ export LC_ALL='en_US.UTF-8'
export LANG=${LC_ALL} export LANG=${LC_ALL}
export EDITOR='vim' export EDITOR='vim'
export PAGER='less -R' export PAGER='less -R'
export LS_COLORS='no=00:fi=00:di=36:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;33-brgreen=01;33:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;33:*~=01;33:*#=01;33:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:' export LS_COLORS='no=00:fi=00:di=34:ow=34;40:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;32:*~=01;32:*#=01;32:*.bak=01;33:*.BAK=01;33:*.old=01;33:*.OLD=01;33:*.org_archive=01;33:*.off=01;33:*.OFF=01;33:*.dist=01;33:*.DIST=01;33:*.orig=01;33:*.ORIG=01;33:*.swp=01;33:*.swo=01;33:*,v=01;33:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
# }}} # }}}
# {{{ common aliases # {{{ common aliases
@ -178,9 +178,9 @@ if is_zsh; then
rb='%B%F{yellow}]%f%b' rb='%B%F{yellow}]%f%b'
bb='%B%F{yellow} %f%b' bb='%B%F{yellow} %f%b'
prompt_cwd='%B%d%b' prompt_cwd='%B%d%b'
prompt_user='%(1000#..%(1205#..%F{red}%n%B%F{yellow}@%f%b))' prompt_user='%(1000#..%(1205#..%B%F{red}%n%F{yellow}@%f%b))'
prompt_host='%m' prompt_host='%m'
prompt_bang='%(!.%F{red}.%F{blue})%#%f' prompt_bang='%B%(!.%F{red}.%F{green})%#%f%b'
prompt_jobs='%(1j.%B%F{yellow}[%f%bjobs: %B%F{red}%j%F{yellow}]%f%b.)' prompt_jobs='%(1j.%B%F{yellow}[%f%bjobs: %B%F{red}%j%F{yellow}]%f%b.)'
precmd() { precmd() {
[[ -n ${vcs_enabled} ]] && vcs_info [[ -n ${vcs_enabled} ]] && vcs_info
@ -191,9 +191,9 @@ if is_zsh; then
fi fi
PROMPT="${prompt_info}${newline}${prompt_bang} " PROMPT="${prompt_info}${newline}${prompt_bang} "
} }
PROMPT2='%b%f%_%B%F{yellow}>%f%b ' PROMPT2='%b%f%_%B%F{green}>%f%b '
PROMPT3='%b%f?%B%F{yellow}#%f%b ' PROMPT3='%b%f?%B%F{green}#%f%b '
PROMPT4='%b%f+%N:%i%B%F{yellow}>%f%b ' PROMPT4='%b%f+%N:%i%B%F{green}>%f%b '
# }}} # }}}
# {{{ key bindings # {{{ key bindings
bindkey -e bindkey -e
@ -312,16 +312,16 @@ else
if [[ ${UID} -eq 1000 || ${UID} -eq 1205 ]]; then if [[ ${UID} -eq 1000 || ${UID} -eq 1205 ]]; then
prompt_user='' prompt_user=''
else else
prompt_user="${nred}\u${byellow}@${reset}" prompt_user="${bred}\u${byellow}@${reset}"
fi fi
prompt_info="${lb}${prompt_user}${prompt_host}${bb}${prompt_cwd}${rb}${lb}bash-\v${rb}" prompt_info="${lb}${prompt_user}${prompt_host}${bb}${prompt_cwd}${rb}${lb}bash-\v${rb}"
else else
prompt_info='' prompt_info=''
fi fi
if [[ $UID -eq 0 ]]; then if [[ $UID -eq 0 ]]; then
prompt_bang_color="${nred}" prompt_bang_color="${bred}"
else else
prompt_bang_color="${nblue}" prompt_bang_color="${bgreen}"
fi fi
PS1="${prompt_info}${newline}${prompt_bang_color}${prompt_bang} " PS1="${prompt_info}${newline}${prompt_bang_color}${prompt_bang} "
} }

View file

@ -34,30 +34,28 @@ set -g monitor-activity on
set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@" set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@"
set -g default-terminal "screen-256color" set -g default-terminal "screen-256color"
set -g status-bg "colour232" set -g status-bg "colour0"
set -g message-command-fg "colour232" set -g message-command-fg "colour7"
set -g status-justify "left" set -g status-justify "left"
set -g status-left-length "100" set -g status-left-length "100"
set -g status "on" set -g status "on"
set -g pane-active-border-fg "colour14" set -g pane-active-border-fg "colour14"
set -g message-bg "colour232" set -g message-bg "colour11"
set -g status-right-length "100" set -g status-right-length "100"
set -g status-right-attr "none" set -g status-right-attr "none"
set -g message-fg "colour245" set -g message-fg "colour7"
set -g message-command-bg "colour232" set -g message-command-bg "colour11"
set -g status-attr "none" set -g status-attr "none"
set -g status-utf8 "on" set -g status-utf8 "on"
set -g pane-border-fg "colour11" set -g pane-border-fg "colour11"
set -g status-left-attr "none" set -g status-left-attr "none"
setw -g window-status-fg "colour237" setw -g window-status-fg "colour10"
setw -g window-status-attr "none" setw -g window-status-attr "none"
setw -g window-status-activity-bg "colour232" setw -g window-status-activity-bg "colour0"
setw -g window-status-activity-attr "none" setw -g window-status-activity-attr "none"
setw -g window-status-activity-fg "colour243" setw -g window-status-activity-fg "colour14"
setw -g window-status-bg "colour232" setw -g window-status-bg "colour0"
setw -g window-status-bell-bg "colour88" set -g status-left "#[fg=colour15,bg=colour14,bold] #h #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] #S #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]#[default]"
setw -g window-status-bell-fg "colour232" set -g status-right "#[fg=colour10,bg=colour0]#I:#P #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %a %e #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] %k:%M "
set -g status-left "#[fg=colour74,bg=colour17,bold] #h #[fg=colour17,bg=colour33,nobold,nounderscore,noitalics]#[fg=colour17,bg=colour33] #S #[fg=colour33,bg=colour232,nobold,nounderscore,noitalics]#[default]"
set -g status-right "#[fg=colour232,bg=colour232]#I:#P #[fg=colour33,bg=colour232,nobold,nounderscore,noitalics]#[fg=colour17,bg=colour33] %a %e #[fg=colour17,bg=colour33,nobold,nounderscore,noitalics]#[fg=colour74,bg=colour17] %k:%M "
setw -g window-status-format " #I:#W " setw -g window-status-format " #I:#W "
setw -g window-status-current-format "#[fg=colour75,bg=colour232] #I:#W #[default]" setw -g window-status-current-format "#[fg=colour7,bg=colour8] #I:#W #[default]"

9
vimrc
View file

@ -109,7 +109,7 @@ if v:version >= 700
Plugin 'junegunn/seoul256.vim' "seoul256 Plugin 'junegunn/seoul256.vim' "seoul256
Plugin 'morhetz/gruvbox' "gruvbox Plugin 'morhetz/gruvbox' "gruvbox
Plugin 'nanotech/jellybeans.vim' "jellybeans Plugin 'nanotech/jellybeans.vim' "jellybeans
Plugin 'whatyouhide/vim-gotham' "gotham Plugin 'blueshirts/darcula' "darcula
" syntax highlight plugins " syntax highlight plugins
Plugin 'puppetlabs/puppet-syntax-vim' "puppet Plugin 'puppetlabs/puppet-syntax-vim' "puppet
@ -158,11 +158,10 @@ if v:version >= 700
map <S-Insert> <MiddleMouse> map <S-Insert> <MiddleMouse>
map! <S-Insert> <MiddleMouse> map! <S-Insert> <MiddleMouse>
endif endif
colorscheme gotham
"------- gruvbox ------- "------- gruvbox -------
"let g:gruvbox_italic=0 let g:gruvbox_italic=0
"let g:gruvbox_underline=0 let g:gruvbox_underline=0
"colorscheme gruvbox colorscheme gruvbox
"------ solarized ------ "------ solarized ------
"let g:solarized_bold=0 "let g:solarized_bold=0
"let g:solarized_italic=0 "let g:solarized_italic=0

View file

@ -33,36 +33,6 @@ URxvt.matcher.button: 3
URxvt.keysym.C-C: perl:clipboard:copy URxvt.keysym.C-C: perl:clipboard:copy
URxvt.keysym.C-V: perl:clipboard:paste URxvt.keysym.C-V: perl:clipboard:paste
! }}} ! }}}
! {{{ gotham color scheme
URxvt.foreground: #98d1ce
URxvt.background: #0a0f14
URxvt.cursorColor: #98d1ce
! black
URxvt.color0: #0a0f14
URxvt.color8: #10151b
! red
URxvt.color1: #c33027
URxvt.color9: #d26939
! green
URxvt.color2: #26a98b
URxvt.color10: #081f2d
! yellow
URxvt.color3: #edb54b
URxvt.color11: #245361
! blue
URxvt.color4: #195465
URxvt.color12: #093748
! magenta
URxvt.color5: #4e5165
URxvt.color13: #888ba5
! cyan
URxvt.color6: #33859d
URxvt.color14: #599caa
! white
URxvt.color7: #98d1ce
URxvt.color15: #d3ebe9
! }}}
! {{{ drop in Solarized colorscheme for Xresources/Xdefaults ! {{{ drop in Solarized colorscheme for Xresources/Xdefaults
!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB !!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
@ -85,26 +55,27 @@ URxvt.color15: #d3ebe9
!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 !!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
!! common !! common
!#define S_yellow #b58900 #define S_yellow #b58900
!#define S_orange #cb4b16 #define S_orange #cb4b16
!#define S_red #dc322f #define S_red #dc322f
!#define S_magenta #d33682 #define S_magenta #d33682
!#define S_violet #6c71c4 #define S_violet #6c71c4
!#define S_blue #268bd2 #define S_blue #268bd2
!#define S_cyan #2aa198 #define S_cyan #2aa198
!#define S_green #859900 #define S_green #859900
!! dark !! dark
!#define S_base03 #002b36 #define S_base03 #002b36
!#define S_base02 #073642 #define S_base02 #073642
!#define S_base01 #586e75 #define S_base01 #586e75
!#define S_base00 #657b83 #define S_base00 #657b83
!#define S_base0 #839496 #define S_base0 #839496
!#define S_base1 #93a1a1 #define S_base1 #93a1a1
!#define S_base2 #eee8d5 #define S_base2 #eee8d5
!#define S_base3 #fdf6e3 #define S_base3 #fdf6e3
!! light !! light
!#define S_base03 #fdf6e3 !#define S_base03 #fdf6e3
!#define S_base02 #eee8d5 !#define S_base02 #eee8d5
!#define S_base01 #93a1a1 !#define S_base01 #93a1a1
@ -114,44 +85,43 @@ URxvt.color15: #d3ebe9
!#define S_base2 #073642 !#define S_base2 #073642
!#define S_base3 #002b36 !#define S_base3 #002b36
!! colors themselves URxvt.background: S_base03
!URxvt.background: S_base03 URxvt.foreground: S_base0
!URxvt.foreground: S_base0 URxvt.colorBD: S_base3
!URxvt.colorBD: S_base3 URxvt.fadeColor: S_base03
!URxvt.fadeColor: S_base03 URxvt.cursorColor: S_base3
!URxvt.cursorColor: S_base3 URxvt.pointerColorBackground:S_base01
!URxvt.pointerColorBackground:S_base01 URxvt.pointerColorForeground:S_base1
!URxvt.pointerColorForeground:S_base1
!! black dark/light !! black dark/light
!URxvt.color0: S_base02 URxvt.color0: S_base02
!URxvt.color8: S_base03 URxvt.color8: S_base03
!! red dark/light !! red dark/light
!URxvt.color1: S_red URxvt.color1: S_red
!URxvt.color9: S_orange URxvt.color9: S_orange
!! green dark/light !! green dark/light
!URxvt.color2: S_green URxvt.color2: S_green
!URxvt.color10: S_base01 URxvt.color10: S_base01
!! yellow dark/light !! yellow dark/light
!URxvt.color3: S_yellow URxvt.color3: S_yellow
!URxvt.color11: S_base00 URxvt.color11: S_base00
!! blue dark/light !! blue dark/light
!URxvt.color4: S_blue URxvt.color4: S_blue
!URxvt.color12: S_base0 URxvt.color12: S_base0
!! magenta dark/light !! magenta dark/light
!URxvt.color5: S_magenta URxvt.color5: S_magenta
!URxvt.color13: S_violet URxvt.color13: S_violet
!! cyan dark/light !! cyan dark/light
!URxvt.color6: S_cyan URxvt.color6: S_cyan
!URxvt.color14: S_base1 URxvt.color14: S_base1
!! white dark/light !! white dark/light
!URxvt.color7: S_base2 URxvt.color7: S_base2
!URxvt.color15: S_base3 URxvt.color15: S_base3
! }}} ! }}}