Commit 889651eb authored by Hermann Mayer's avatar Hermann Mayer
Browse files

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

parents 281fb7e9 5442cbfb

config/addons.sh.dist

+0 −1
Original line number Diff line number Diff line
@@ -4,4 +4,3 @@ function o() 
{

    xdg-open $1

}

config/exports.conf.dist

+3 −0
Original line number Diff line number Diff line
@@ -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

+6 −0
Original line number Diff line number Diff line
@@ -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

+12 −0
Original line number Diff line number Diff line 
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

+1 −1
Original line number Diff line number Diff line
@@ -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