From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Tue, 16 Dec 2014 14:08:15 +0000 (+0000)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/79576a460da69ad9e5862ab7bfb30788c8367c77?hp=13ca98214499f8b8cb1af001d3a3ae564355e983

Merge branch 'master' of tardis:/dotfiles
---

diff --git a/.gitmodules b/.gitmodules
index ed6c2a9..b274d06 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "awesome/vicious"]
-	path = awesome/vicious
-	url = http://git.sysphere.org/vicious
 [submodule "awesome/awesome-freedesktop"]
 	path = awesome/awesome-freedesktop
 	url = https://github.com/terceiro/awesome-freedesktop.git
diff --git a/awesome/rules.lua b/awesome/rules.lua
index a78a85f..2d07e9d 100644
--- a/awesome/rules.lua
+++ b/awesome/rules.lua
@@ -3,17 +3,17 @@ local utils = require("utils")
 -- {{{ Rules
 local sc = screen.count()
 
+if sc == 1 then mediatag = tags[1][9] end
 if sc == 2 then mediatag = tags[2][3] end
-if sc == 1 then mediatag = tags[1][4] end
 
-if sc == 2 then wwwtag = tags[2][1] end
 if sc == 1 then wwwtag = tags[1][2] end
+if sc == 2 then wwwtag = tags[2][1] end
 
-if sc == 2 then imtag = tags[2][2] end
 if sc == 1 then imtag = tags[1][3] end
+if sc == 2 then imtag = tags[2][2] end
 
+if sc == 1 then socialtag = tags[1][4] end
 if sc == 2 then socialtag = tags[2][4] end
-if sc == 1 then socialtag = tags[1][5] end
 
 awful.rules.rules = {
     -- All clients will match this rule.
diff --git a/bin/old/ubuntu-minimal-install b/bin/old/ubuntu-minimal-install
deleted file mode 100755
index 1786615..0000000
--- a/bin/old/ubuntu-minimal-install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#######################################################################
-# Ubuntu-Desktop-Minimal: Post-install script to install only the bare
-#			  essentials of an Ubuntu Desktop.
-#######################################################################
-echo "[*] Installing Gnome Essentials"
-sudo apt-get -y install gnome-core gdm network-manager-gnome fast-user-switch-applet \
-human-theme x11-xserver-utils tangerine-icon-theme gnome-themes-ubuntu ubuntu-artwork \
-jockey-gtk gnome-screensaver gnome-utils
-echo "[*] Installing Application Essentials"
-sudo apt-get install -y gcalctool tsclient
diff --git a/vim/ftplugin/roscpp.vim b/vim/ftplugin/roscpp.vim
index e69de29..c43b32e 100644
--- a/vim/ftplugin/roscpp.vim
+++ b/vim/ftplugin/roscpp.vim
@@ -0,0 +1,9 @@
+augroup fs_roscpp
+    autocmd!
+    autocmd BufEnter *.cpp let b:fswitchdst  = 'h'
+    autocmd BufEnter *.cpp let b:fswitchlocs = 'reg:|src$|include/**|'
+    autocmd BufEnter *.h   let b:fswitchdst  = 'cpp'
+    autocmd BufEnter *.h   let b:fswitchlocs = 'reg:/include.*/src/'
+augroup END
+
+set makeprg=catkin_make\ -C$ROS_WORKSPACE
diff --git a/vim/ultisnips/c.snippets b/vim/ultisnips/c.snippets
index 618bfe3..d535228 100644
--- a/vim/ultisnips/c.snippets
+++ b/vim/ultisnips/c.snippets
@@ -67,16 +67,14 @@ snippet once "Include header once only guard"
 #ifndef ${1:`!p
 if not snip.c:
 	import random, string
-	name = re.sub(r'[^A-Za-z0-9]+','_', snip.fn).upper()
-	rand = ''.join(random.sample(string.ascii_letters+string.digits, 8))
-	snip.rv = ('%s_%s' % (name,rand)).upper()
+	snip.rv = re.sub(r'[^A-Za-z0-9]+','_', snip.fn).upper()
 else:
 	snip.rv = snip.c`}
 #define $1
 
 ${VISUAL}${0}
 
-#endif /* end of include guard: $1 */
+#endif // $1
 endsnippet
 
 snippet td "Typedef"
diff --git a/vim/vimrc b/vim/vimrc
index 23e9b8a..c365418 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -232,12 +232,6 @@ augroup cursor_pos
                 \ endif
 augroup END
 
-" auto source vimrc when saved {{{2
-augroup source_vimrc
-    au!
-    autocmd bufwritepost vimrc source $MYVIMRC
-augroup END
-
 " bindings {{{1
 
 " allow both <space> and / to be <leader>
@@ -400,6 +394,13 @@ let g:checkattach_filebrowser = 'ranger'
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 
+" fswitch {{{2
+nnoremap <silent> <Leader>ff :FSHere<CR>
+nnoremap <silent> <Leader>fl :FSRight<CR>
+nnoremap <silent> <Leader>fh :FSLeft<CR>
+nnoremap <silent> <Leader>fL :FSSplitRight<CR>
+nnoremap <silent> <Leader>fH :FSSplitLeft<CR>
+
 " fugitive {{{2
 nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>
 " delete fugitive buffers when closed
diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py
index ba18821..74d7b8e 100644
--- a/vim/ycm_extra_conf.py
+++ b/vim/ycm_extra_conf.py
@@ -31,7 +31,6 @@ def FlagsForFile( filename, **kwargs ):
   flags += rospack()
   relative_to = cwd
   final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
-  print flags
 
   return {
     'flags': final_flags,
diff --git a/zsh/aliases/pacman.zsh b/zsh/aliases/pacman.zsh
index 8cb322c..2db1503 100644
--- a/zsh/aliases/pacman.zsh
+++ b/zsh/aliases/pacman.zsh
@@ -16,6 +16,8 @@ alias pacexp='sudo pacman -D --asexplicit'  # Mark package as explicit
 alias pacinsd='sudo pacman -S --asdeps'        # Install given package(s) as dependencies of another package
 alias pacmir='sudo pacman -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
 
+[[ -x /usr/bin/packer ]] && alias aur='packer'
+
 # https://bbs.archlinux.org/viewtopic.php?id=93683
 paclist() {
   pacman -Qei | awk 'BEGIN {FS=": "}/^Name/{printf("\033[1;36m%s\033[0m ",$2)}/^Description/{print $2}'