From fee1b594f81d8d5b327273ff52b567d6241afbe4 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sun, 1 Apr 2012 12:39:07 +0200 Subject: [PATCH] use solarized color scheme in urxvt and vim --- .gitmodules | 5 +- Xdefaults | 136 +++++++++++++++++++------------- vim/bundle/vim-colors-solarized | 1 + vimrc | 16 ++-- zshrc | 2 +- 5 files changed, 92 insertions(+), 68 deletions(-) create mode 160000 vim/bundle/vim-colors-solarized diff --git a/.gitmodules b/.gitmodules index 19d7f3d..2c547fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,10 @@ url = https://github.com/digitaltoad/vim-jade.git [submodule "vim/bundle/vim-coffee-script"] path = vim/bundle/vim-coffee-script - url = https://github.com/kchmck/vim-coffee-script.git + url = https://github.com/kchmck/vim-coffee-script.git [submodule "config/awesome"] path = config/awesome url = git@github.com:igrat/awesome-config.git +[submodule "vim/bundle/vim-colors-solarized"] + path = vim/bundle/vim-colors-solarized + url = git://github.com/altercation/vim-colors-solarized.git diff --git a/Xdefaults b/Xdefaults index 33e6783..2509950 100644 --- a/Xdefaults +++ b/Xdefaults @@ -1,68 +1,90 @@ -# transparency - true or false (default) -# URxvt*transparent: true +!------------------------------------------------------------------------------- +! Xft settings +!------------------------------------------------------------------------------- -# tint with any color; i.e., blue, red, tomato4, olivedrab2, etc. -# some nice listings are at: -# http://www.nisrv.com/drupal/?q=node/11 -# http://www.htmlgoodies.com/tutorials/colors/article.php/3478921 -# URxvt*tintColor: olivedrab2 +Xft.dpi: 96 +Xft.antialias: true +Xft.rgba: rgb +Xft.hinting: true +Xft.hintstyle: hintslight -# shading - 0 to 99 darkens, 101 to 200 lightens. -# Don't use with tintColor; just use a darker or lighter color instead. -# URxvt*shading: 20 +!------------------------------------------------------------------------------- +! URxvt settings +! Colours lifted from Solarized (http://ethanschoonover.com/solarized) +! More info at: +! http://pod.tst.eu/http://cvs.schmorp.de/rxvt-unicode/doc/rxvt.1.pod +!------------------------------------------------------------------------------- -# scrollback buffer lines - 65535 is max on most machines (64 is default) -URxvt*saveLines: 12000 +URxvt.depth: 32 +URxvt.geometry: 90x30 +URxvt.transparent: false +URxvt.fading: 0 +! URxvt.urgentOnBell: true +! URxvt.visualBell: true +URxvt.loginShell: true +URxvt.saveLines: 50 +URxvt.internalBorder: 3 +URxvt.lineSpace: 0 -# font color (default is black) -URxvt*foreground: White - -# background color (prior to tinting) (default is white) -URxvt*background: Black - -# Xft (X FreeType) with Bitstream, DejaVu, Liberation, or Terminus fonts: -# Fedora/debian packages: libXft/libxft2 -# An anti-aliased font setup with Xft looks fantastic; it can be a bit choppy -# on older systems. You can always turn off anti-aliasing (antialias=false) if -# your terminal is sluggish. Use only ONE of the Xft pairs below: -# -# Xft: Bitstream fonts -# Fedora/debian packages: bitstream-vera-sans-mono-fonts/ttf-bitstream-vera -#URxvt*font: xft:Bitstream Vera Sans Mono:pixelsize=12:antialias=true:hinting=true -#URxvt*boldFont: xft:Bitstream Vera Sans Mono:bold:pixelsize=12:alntialias=true:hinting=true -# -# Xft: DejaVu fonts -# Fedora/debian packages: dejavu-sans-mono-fonts/ttf-dejavu -#URxvt*font: xft:DejaVu Sans Mono:pixelsize=12:antialias=true:hinting=true -#URxvt*boldFont: xft:DejaVu Sans Mono:bold:pixelsize=12:antialias=true:hinting=true -# -# Xft: Liberation fonts -# Fedora/debian packages: liberation-mono-fonts/ttf-liberation -#URxvt*font: xft:Liberation Mono:pixelsize=13:antialias=true:hinting=true -#URxvt*boldFont: xft:Liberation Mono:bold:pixelsize=13:antialias=true:hinting=true -# -# Xft: Terminus fonts -# Fedora/debian packages: terminus-fonts/xfonts-terminus +! Fonts URxvt*font: xft:terminus:pixelsize=15 URxvt*boldFont: xft:terminus:bold:pixelsize=15 -# Traditional fonts - a more traditional font setup in lieu of xft -#URxvt*font:-*-courier-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -#URxvt*boldFont:-*-courier-bold-r-normal-*-14-*-*-*-*-*-iso8859-1 +! Scrollbar +URxvt.scrollStyle: rxvt +URxvt.scrollBar: false -# Replace blue folder colors with a lighter shade for clarity. To -# set colored folders and files within urxvt, xterm, and aterm, add -# the following line to your ~/.bashrc ($HOME/.bashrc) file under -# the heading "# User specific aliases and functions": -# alias ls="ls -h --color=auto" -URxvt*color4: RoyalBlue -URxvt*color12: RoyalBlue +! Perl extensions +URxvt.perl-ext-common: default,matcher +URxvt.matcher.button: 1 +URxvt.urlLauncher: firefox -# scrollbar - true (default) or false -URxvt*scrollBar: false +! Cursor +URxvt.cursorBlink: true +URxvt.cursorColor: #657b83 +URxvt.cursorUnderline: false -# scrollbar position - left=false (default) or right=true -URxvt*scrollBar_right: false +! Pointer +URxvt.pointerBlank: true -# scrollbar style - rxvt (default), plain, next, or xterm -URxvt*scrollstyle: rxvt +!!Source http://github.com/altercation/solarized + +*background: #002b36 +*foreground: #657b83 +!!*fading: 40 +*fadeColor: #002b36 +*cursorColor: #93a1a1 +*pointerColorBackground: #586e75 +*pointerColorForeground: #93a1a1 + +!! black dark/light +*color0: #073642 +*color8: #002b36 + +!! red dark/light +*color1: #dc322f +*color9: #cb4b16 + +!! green dark/light +*color2: #859900 +*color10: #586e75 + +!! yellow dark/light +*color3: #b58900 +*color11: #657b83 + +!! blue dark/light +*color4: #268bd2 +*color12: #839496 + +!! magenta dark/light +*color5: #d33682 +*color13: #6c71c4 + +!! cyan dark/light +*color6: #2aa198 +*color14: #93a1a1 + +!! white dark/light +*color7: #eee8d5 +*color15: #fdf6e3 diff --git a/vim/bundle/vim-colors-solarized b/vim/bundle/vim-colors-solarized new file mode 160000 index 0000000..528a59f --- /dev/null +++ b/vim/bundle/vim-colors-solarized @@ -0,0 +1 @@ +Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 diff --git a/vimrc b/vimrc index 7b88cb2..9b1e80c 100644 --- a/vimrc +++ b/vimrc @@ -72,11 +72,9 @@ if v:version >= 703 endif " COLOR SCHEME -"set t_Co=256 set background=dark -"if has("gui_running") -" colorscheme slate -"endif +let g:solarized_contrast = "high" +colorscheme solarized " FOLDING set foldenable " enable folding @@ -269,11 +267,11 @@ set statusline+=%l/%L " cursor line/total lines set statusline+=\ %P\ " percent through file set laststatus=2 " always show status line -"" COLORING ELEMENTS -highlight statusLine cterm=bold ctermfg=yellow ctermbg=darkred -highlight statusLineNC cterm=bold ctermfg=black ctermbg=white - -highlight modeMsg cterm=bold ctermfg=white ctermbg=darkblue +"" TODO COLORING Status line +"highlight statusLine cterm=bold ctermfg=yellow ctermbg=darkred +"highlight statusLineNC cterm=bold ctermfg=black ctermbg=white +" +"highlight modeMsg cterm=bold ctermfg=white ctermbg=darkblue "" MISC FUNCTIONS function! FileSize() diff --git a/zshrc b/zshrc index c772789..b2b06f6 100644 --- a/zshrc +++ b/zshrc @@ -5,7 +5,7 @@ export ZSH=$HOME/.oh-my-zsh # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -export ZSH_THEME="afowler" +export ZSH_THEME="blinks" # Set to this to use case-sensitive completion # export CASE_SENSITIVE="true"