Merge branch 'master' of github.com:indrekj/dotfiles

.Xdefaults

@@ -4,9 +4,11 @@
 
 Xft.dpi: 109
 Xft.hinting: true
-Xft.hintstyle: hintfull
+Xft.autohint: false
+Xft.hintstyle: hintslight
 Xft.antialias: true
 Xft.rgba: rgb
+Xft.lcdfilter: lcddefault
 
 !
 ! Xcursor
@@ -40,7 +42,8 @@ Xcursor.size: 16
 *hideButtons:   true
 
 !urxvt*font: xft:DejaVu Sans Mono:size=11
-*font: xft:Inconsolata:pixelsize=20
+*xftAntialias: true
+*font: xft:Inconsolata:pixelsize=18:antialias=true:hinting=true
 
 ! TODO: use alt or rxvt own stuff. we use ctrl-num keys in vim
 ! Bind C-0, C-1, ..., C-6 activate larger fonts.

.fonts.conf

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <match target="font">
+        <edit name="antialias" mode="assign">
+            <bool>true</bool>
+        </edit>
+        <edit name="hinting" mode="assign">
+            <bool>true</bool>
+        </edit>
+        <edit name="rgba" mode="assign">
+            <const>rgb</const>
+        </edit>
+        <edit name="autohint" mode="assign">
+            <bool>false</bool>
+        </edit>
+        <edit name="hintstyle" mode="assign">
+            <const>hintslight</const>
+        </edit>
+        <edit mode="assign" name="lcdfilter">
+            <const>lcddefault</const>
+        </edit>
+    </match>
+</fontconfig>

.gitconfig

@@ -25,6 +25,7 @@
 [core]
   editor = vim
 	autocrlf = input
+	excludesfile = /home/innu/.gitignore_global
 [diff]
   wordRegex = (, )?[^[:space:],().]+[push]
   default = current

.vimrc

@@ -49,7 +49,6 @@ set wildignore+=*.luac                           " Lua byte code
 set wildignore+=migrations                       " Django migrations
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=classes
-set wildignore+=lib
 set wildignore+=log
 
 set foldlevel=100
@@ -81,8 +80,14 @@ inoremap <silent> <A-k> <Esc>:m-2<CR>==gi
 vnoremap <silent> <A-j> :m'>+<CR>gv=gv
 vnoremap <silent> <A-k> :m-2<CR>gv=gv
 
+" ; key repeats last search. bind it to ;; so we can use ; as a leader key
+nmap ;; ;<cr>
+
 let mapleader = ";"
+
 let ruby_operators = 1 " hightlight ruby operators
+let g:rubycomplete_buffer_loading = 1
+let g:rubycomplete_classes_in_global = 1
 
 " required by Vundle
 filetype off
@@ -129,11 +134,6 @@ inoremap # X<BS>#
 source $VIMRUNTIME/filetype.vim
 source $VIMRUNTIME/macros/matchit.vim
 
-autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
-autocmd FileType ruby,eruby let g:rubycomplete_buffer_loading = 1
-autocmd FileType ruby,eruby let g:rubycomplete_rails = 1
-autocmd FileType ruby,eruby let g:rubycomplete_classes_in_global = 1
-
 autocmd BufEnter *.html set filetype=xhtml
 autocmd BufEnter */nginx/*.conf* set filetype=nginx
 autocmd BufEnter *.html.erb source $HOME/.vim/syntax/html5.vim
@@ -149,7 +149,7 @@ autocmd FileType text setlocal textwidth=78
 let g:ctrlp_map = "<leader>t"
 
 " Regenerate tags
-map <leader>rt :!ctags --extra=+f --languages=-javascript --exclude=.git --exclude=log -R * `rvm gemdir`/gems/*
+map <leader>rt :!find . -iname *.rb \| xargs ctags --extra=+f
 "map <leader>rt :!ctags --extra=+f --languages=-javascript --exclude=.git --exclude=log -R * `rvm gemdir`/gems/*<CR><C-M>
 
 " Edit another file in the same directory as the current file

.zshrc

@@ -70,6 +70,8 @@ export EDITOR='vim'
 
 # Aliases
 alias pp='python -mjson.tool'
+alias spotify-next='DISPLAY=:0 dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next'
+alias spotify-pause='DISPLAY=:0 dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause'
 
 # no spelling correction for these commands
 alias vim='nocorrect vim'
@@ -359,3 +361,5 @@ export GOROOT=/usr/local/go
 #export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true"
 
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
+
+PATH=$PATH:$HOME/.cabal/bin