Merge branch 'master' of ssh://code.jity.de:10022/Jack12816/linux-environment

config/addons.sh.dist

@@ -4,4 +4,3 @@ function o()
 {
     xdg-open $1
 }
-

config/exports.conf.dist

@@ -42,6 +42,9 @@ export LC_ALL="de_DE.UTF-8"
 # Default Editor
 export EDITOR=vim
 
+# Add a local binary path for scripts
+export PATH="$PATH:$HOME/.bin"
+
 # Include paths to list which tab completion from everywhere
 # export CDPATH="$CDPATH:/root/Desktop/X:/root/Desktop/X/Projects/Coding"
 

dot/.gitconfig.dist

@@ -43,8 +43,14 @@
     p = pull
     b = branch -va
     l = log
+    weg = push
+    f = fetch
+    d = diff
 
 ; [merge]
 ;     tool = meld
 ; [mergetool "meld"]
 ;     path = ~/.linux-environment/vendors/bright-meld
+
+[clean]
+    requireForce = false

dotrc/.vim/snippets/php.snippets

 snippet ddd
 	echo '<pre>'; \Doctrine\Common\Util\Debug::dump(${1:});echo '</pre>';
 snippet pve
+	ini_set('xdebug.var_display_max_depth', 50);
+	ini_set('xdebug.var_display_max_children', 256);
+	ini_set('xdebug.var_display_max_data', 1024);
 	echo '<pre>';var_dump(${1:});exit;
 snippet pv
+	ini_set('xdebug.var_display_max_depth', 50);
+	ini_set('xdebug.var_display_max_children', 256);
+	ini_set('xdebug.var_display_max_data', 1024);
 	echo '<pre>';var_dump(${1:});echo '</pre>';
 snippet vd
+	ini_set('xdebug.var_display_max_depth', 50);
+	ini_set('xdebug.var_display_max_children', 256);
+	ini_set('xdebug.var_display_max_data', 1024);
 	var_dump(${1:});
 snippet vde
+	ini_set('xdebug.var_display_max_depth', 50);
+	ini_set('xdebug.var_display_max_children', 256);
+	ini_set('xdebug.var_display_max_data', 1024);
 	var_dump(${1:});exit;
 snippet snip
 	echo "\n------------------------[SNIP]------------------------\n\n";${1:}

dotrc/.vim/vimrc/bundles.vim

@@ -144,7 +144,7 @@ endif
 
 if 1 == VimRCBundlesJavaScript
   " JSON syntax
-  Plugin 'helino/vim-json'
+  Plugin 'elzr/vim-json'
   " Mustache Templating support
   Plugin 'juvenn/mustache.vim'
   " Jade Template Engine Support

dotrc/.vim/vimrc/functions.vim

@@ -114,3 +114,9 @@ command! -complete=shellcmd CleanJade call s:CleanJade()
 command! Visual      normal! v
 command! VisualLine  normal! V
 command! VisualBlock execute "normal! \<C-v>"
+
+function s:OpenTerminal()
+  silent !clear
+  silent execute "!i3-sensible-terminal -cd " . getcwd() . " &"
+endfunction
+command! -complete=shellcmd OpenTerminal call s:OpenTerminal()

dotrc/.vim/vimrc/keymap.vim

@@ -258,3 +258,6 @@ cmap w!! %!sudo tee > /dev/null %
 " Open the current file in a browser
 nnoremap <LEADER>of :exe ':silent !firefox %'<CR>
 nnoremap <LEADER>oc :exe ':silent !chromium-browser %'<CR>
+
+" Open the cwd in an i3-sensitive terminal
+nnoremap <C-Space> :OpenTerminal<CR>

lib/aliases.sh

@@ -26,6 +26,7 @@ alias p='pwd'
 alias mkdir='mkdir -p -v'
 alias openports='netstat --all --numeric --programs --inet --inet6 | tail -n +3 | rev | sort -k 1,1 | rev'
 alias less='less -R'
+alias x='exit'
 
 complete -W "$(cat "${HOME}/.bash_history" | egrep '^ssh |^scp ' | grep '\.' | egrep '^[^0-9]' | sort | uniq | sed 's/^ssh //' | sed 's/ $//g' | sed 's/^/\"/' | sed 's/$/\"/');" ssh
 complete -W "$(cat "${HOME}/.bash_history" | egrep '^ssh |^scp ' | grep '\.' | egrep '^[^0-9]' | sort | uniq | sed 's/^ssh //' | sed 's/ $//g' | sed 's/^/\"/' | sed 's/$/\"/');" scp

lib/helper/files.sh

@@ -247,7 +247,22 @@ function mpx()
     txtcyn='\e[0;36m' # Cyan
     txtrst='\e[0m'    # Text Reset
 
-    find */ -maxdepth 0 | while read file; do
+    paths="*/"
+    cmd="${@}"
+
+    if [ $# -gt 1 ]; then
+        paths=''
+        cmd="${@: -1}"
+        for path in "${@:1:$(($#-1))}"; do
+            paths=$(echo "${paths} ${path}")
+        done
+    fi
+
+    if [ '' = "${cmd}" ]; then
+        cmd='ls -lisa'
+    fi
+
+    find ${paths} -maxdepth 0 | while read file; do
 
         echo
         echo
@@ -257,7 +272,7 @@ function mpx()
         echo -e "${txtrst}"
 
         cd "${file}"
-        eval "${@}"
+        eval "${cmd}"
         cd "${CWD}"
     done