dotfiles

configuration files for different softwares
git clone git://z3bra.org/dotfiles
Log | Files | Refs

commit 5177626360a5f4376302f17d1f499bbca5856296
parent 1966d3e64aee2b9b5887f10b4b24a4250857a430
Author: z3bra <willy@mailoo.org>
Date:   Wed Dec  4 08:06:06 2013

Merge branch 'master' of z3bra.org:dotfiles

Conflicts:
	tmux.conf

Diffstat:
 Xresources            | 46 ++++++++++++++++++++++++++++------------------
 cwmrc                 | 17 +++++++++++------
 tmux.conf             |  4 ++--
 vim/colors/shblah.vim | 14 ++++++++------
 vimrc                 | 11 +++++++----
 xbindkeysrc           |  8 ++++----
 xinitrc               | 22 +++++++++++-----------
 zshrc                 |  5 ++++-
 8 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/Xresources b/Xresources @@ -5,26 +5,26 @@ ! ============================================================== ! Terminal colors (dark) --------------------------------------- -*background:#222222 -*foreground:#e8e9ca +URxvt*background:[90]#221a17 +URxvt*foreground:#b3b4b1 *color0: #222222 -*color1: #8b3e2f -*color2: #526f33 +*color1: #784742 +*color2: #427363 *color3: #665847 -*color4: #4a708b +*color4: #6a708b *color5: #7a378b -*color6: #528b8b -*color7: #999999 +*color6: #52707b +*color7: #b3b4b1 -*color8: #4c4c4c -*color9: #d75f00 -*color10: #cee318 -*color11: #eee685 -*color12: #9ac0cd -*color13: #9f79ee -*color14: #79cdcd -*color15: #e8e9ca +*color8: #5c4c4c +*color9: #d43f10 +*color10: #cef318 +*color11: #ede265 +*color12: #6ac0fd +*color13: #ef79ae +*color14: #49d4dd +*color15: #ffffff ! URxvt (rxvt-unicode) ----------------------------------------- @@ -37,7 +37,7 @@ URxvt*font: -misc-tamsyn-medium-*-*--14-101-*-*-*-*-*,-*-stlarch URxvt*boldFont: -misc-tamsyn-medium-*-*--14-101-*-*-*-*-*,-*-stlarch-medium-r-*--10-*-*-*-*-* URxvt*scrollBar: false URxvt*cursorBlink: false -URxvt*cursorColor: white +URxvt*cursorColor: #5c4c4c URxvt*internalBorder: 2 URxvt*perl-ext-common: default,url-select,keyboard-select URxvt.url-select.launcher: /usr/bin/dwb @@ -52,10 +52,11 @@ URxvt.colorUL: #a28c64 ! XTerm --------------------------------------------------------- +xterm*background:#222222 +xterm*foreground:#e8e9ca xterm*scrollBar: false -xterm*faceName: gohu +xterm*faceName: tamsyn xterm*faceSize: 8 -xterm*geometry: 64x2 xterm*boldMode: false xterm*cutNewline: false xterm*on4Clicks: group @@ -72,3 +73,12 @@ xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48,35: xterm*jumpScroll: true xterm*multiScroll: true xterm*saveLines: 512 + +xclock*background: #efefe5 +xclock*face: Archivo Narrow-16 +xclock*foreground: #4a708b +xclock*analog: false +xclock*geometry: +1280+860 +xclock*strftime: %a %d/%m %H:%M +xclock*update: 30 + diff --git a/cwmrc b/cwmrc @@ -7,15 +7,20 @@ sticky yes # Any entry here is shown in the application menu command term urxvt command internet surf http://duckduckgo.com/lite -command fichier pcmanfm -command libreoffice libreoffice -command quakelive "xinit /home/z3bra/.quakelive/xinit -- :1" -command defrag /opt/quake3/iodfengine.x86_64 +command "--------" clear +command rage "xinit rage -- :1" +command defrag "xinit defrag -- :1" +command quakelive "xinit quakelive -- :1" +command teeworlds "xinit teeworlds -- :1" +command sauerbraten "xinit sauerbraten -- :1" + +# do not manage these +ignore xclock # behavior, look & feel -borderwidth 4 +borderwidth 2 color inactiveborder "#222222" -color activeborder "#eee685" +color activeborder "#222222" color font "#ffffff" color menubg "#222222" color selfont "#ffffff" diff --git a/tmux.conf b/tmux.conf @@ -54,7 +54,7 @@ # default statusbar colors set-option -g status-fg black set-option -g status-bg default - #set-option -g status-attr bright + set-option -g status-attr bright # default window title colors set-window-option -g window-status-fg black @@ -80,7 +80,7 @@ # Left / Right status set-option -g status-left-length 0 # old: 96 - set-option -g status-right-length 0 # old: 96 + set-option -g status-right-length 96 # old: 96 set-option -g status-left "" set-option -g status-right "#(~/bin/bar/status.sh -O tmux -F7 -H0 -mbc)" ## }}} diff --git a/vim/colors/shblah.vim b/vim/colors/shblah.vim @@ -17,31 +17,33 @@ let g:colors_name="shblah" " " Actual colours and styles. " + highlight ColorColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=3 highlight Comment term=NONE cterm=bold ctermfg=0 ctermbg=NONE highlight Constant term=NONE cterm=bold ctermfg=2 ctermbg=NONE highlight Cursor term=NONE cterm=bold ctermfg=3 ctermbg=NONE - highlight CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=0 + highlight CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE highlight DiffAdd term=NONE cterm=NONE ctermfg=NONE ctermbg=2 highlight DiffChange term=NONE cterm=NONE ctermfg=NONE ctermbg=4 highlight DiffDelete term=NONE cterm=NONE ctermfg=NONE ctermbg=1 - highlight Folded term=NONE cterm=bold ctermfg=0 ctermbg=0 + highlight FoldColumn term=NONE cterm=bold ctermfg=0 ctermbg=NONE + highlight Folded term=NONE cterm=bold ctermfg=0 ctermbg=NONE highlight Function term=NONE cterm=bold ctermfg=7 ctermbg=NONE highlight Identifier term=NONE cterm=bold ctermfg=1 ctermbg=NONE highlight IncSearch term=NONE cterm=NONE ctermfg=0 ctermbg=4 highlight NonText term=NONE cterm=bold ctermfg=0 ctermbg=NONE highlight Normal term=NONE cterm=NONE ctermfg=7 ctermbg=NONE highlight Pmenu term=NONE cterm=NONE ctermfg=0 ctermbg=7 - highlight PreProc term=NONE cterm=bold ctermfg=3 ctermbg=0 + highlight PreProc term=NONE cterm=bold ctermfg=3 ctermbg=NONE highlight Search term=NONE cterm=bold ctermfg=0 ctermbg=4 highlight Special term=NONE cterm=bold ctermfg=2 ctermbg=NONE highlight SpecialKey term=NONE cterm=NONE ctermfg=2 ctermbg=NONE highlight Statement term=NONE cterm=bold ctermfg=7 ctermbg=NONE - highlight StatusLine term=NONE cterm=NONE ctermfg=7 ctermbg=0 - highlight StatusLineNC term=NONE cterm=NONE ctermfg=6 ctermbg=0 + highlight StatusLine term=NONE cterm=NONE ctermfg=7 ctermbg=NONE + highlight StatusLineNC term=NONE cterm=NONE ctermfg=6 ctermbg=NONE highlight String term=NONE cterm=NONE ctermfg=1 ctermbg=NONE highlight Todo term=NONE cterm=NONE ctermfg=0 ctermbg=11 highlight Type term=NONE cterm=NONE ctermfg=3 ctermbg=NONE - highlight VertSplit term=NONE cterm=bold ctermfg=0 ctermbg=0 + highlight VertSplit term=NONE cterm=bold ctermfg=0 ctermbg=NONE highlight Visual term=NONE cterm=bold ctermfg=7 ctermbg=3 " diff --git a/vimrc b/vimrc @@ -225,12 +225,13 @@ set statusline= set ruler " put everything I need in the ruler -set rulerformat=%-50(%=%M%H%R\ %t\ (%{&enc})%<%4(%)%Y:%{&tw}%9(%l,%c%V%)%4(%)%P%) +set rulerformat=%-28(%=%M%H%R\ %t%<\ %l,%c%V%8(%)%P%) + set list -set listchars=tab:\|\ ,trail:⋅,nbsp:˽ +set listchars=tab:│\ ,trail:⋅,nbsp:˽ -set fillchars=vert:\|,fold:─ +set fillchars=vert:│,fold:- " }}} " > Mapping =================================================================== @@ -329,7 +330,9 @@ fu! ViewTips() " $ strfile vimtweets vimtweets.dat " # mv vimtweets* /usr/share/fortune/ if filereadable('/usr/bin/fortune') - echomsg system('/usr/bin/fortune vimtweets') + if filereadable('/usr/share/fortune/vimtweets') + echomsg system('/usr/bin/fortune vimtweets') + endif endif endfu diff --git a/xbindkeysrc b/xbindkeysrc @@ -1,10 +1,10 @@ # -- X11 custom binds ------------------------------------------- {{{ -- # -- Application launchers ---------------------------------- {{{ -- -# "urxvt" -# Mod4 + space + "urxvt" + Mod4 + space # -# "dwb" -# Mod4 + w + "dwb" + Mod4 + w # # "gmrun" # Alt + F2 diff --git a/xinitrc b/xinitrc @@ -4,10 +4,10 @@ # # load nvidia config -nvidia-settings -l +nvidia-settings -l --config=$HOME/.config/nvidia # Set wallpaper -hsetroot -tile ~/usr/img/bg/stripes.png & +hsetroot -fill ~/usr/img/bg/sunrise.jpg # default cursor xsetroot -cursor_name left_ptr & @@ -16,22 +16,15 @@ function wm() { # Load X resources xrdb -load ~/.Xresources & - # personnal bindings - xbindkeys - # set WM name xsetroot -name $1 - #status bar - ~/bin/bar/status.sh & # it acts kinda weirdly - # Compositing # enable RGBA module for GTK export GTK_MODULES=rgba - #compton -cCb -t-5 -l-5 -r4.2 -o.4 - #compton -cCb -r16 -t-22 -l-22 -o.8 compton -cb -o0 + xbindkeys # spawn window manager exec $1 @@ -39,4 +32,11 @@ function wm() { [[ -z $1 ]] && wm cwm -wm $1 +case $1 in + rage) exec wine ~/var/games/rage/Rage.exe;; + defrag) exec /opt/quake3/iodfengine.x86_64;; + quakelive) exec qlprism;; + teeworlds) exec teeworlds;; + sauerbraten) exec sauerbraten-client;; + *) wm $1;; +esac diff --git a/zshrc b/zshrc @@ -6,6 +6,9 @@ export PATH=$PATH:$HOME/bin:. # Remote MPD server export MPD_HOST='gavroche' +# Mails, anyone ? +export MAIL=$HOME/var/mail/INBOX + ## }}} ## CONFIGURATION FILE FOR Z SHELL :: MAIN {{{ @@ -21,7 +24,7 @@ PROMPT=" %{$fg_bold[yellow]%} » " RPROMPT="%{$fg[black]%}%M:%{$fg_bold[yellow]%}%~%{$reset_color%} " -[[ -z $TMUX ]] && exec tmux +[[ -z $TMUX ]] && [[ $TERM != "screen-256color" ]] && exec tmux # vi-like key bindings bindkey -v