misc changes

Signed-off-by: Florian Pritz <bluewind@xinu.at>

14 files changed, 34 insertions, 8 deletions

diff --git a/.gitconfig b/.gitconfig
index bb1db9c..cd6037b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,6 +24,7 @@
 	p = push --follow-tags
 	dw = diff --color-words
 	ri = rebase -i --autosquash
+	fix = commit --fixup
 [merge]
 	tool = kdiff3
 	conflictstyle = diff3
diff --git a/.gitmodules b/.gitmodules
index 66023aa..ece7ac2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -97,3 +97,12 @@
 [submodule ".vim/bundle/vim-gnupg"]
 	path = .vim/bundle/vim-gnupg
 	url = https://github.com/jamessan/vim-gnupg.git
+[submodule ".vim/bundle/perlomni.vim"]
+	path = .vim/bundle/perlomni.vim
+	url = https://github.com/c9s/perlomni.vim.git
+[submodule ".vim/bundle/editorconfig-vim"]
+	path = .vim/bundle/editorconfig-vim
+	url = https://github.com/editorconfig/editorconfig-vim.git
+[submodule ".vim/bundle/vim-action-ag"]
+	path = .vim/bundle/vim-action-ag
+	url = https://github.com/Chun-Yang/vim-action-ag.git
diff --git a/.i3/config b/.i3/config
index 8227e0e..c151cbe 100644
--- a/.i3/config
+++ b/.i3/config
@@ -53,7 +53,7 @@ bindsym Mod3+F5 exec mpc prev
 bindsym Mod3+F6 exec mpc next
 bindsym Mod3+F11 exec mpc toggle
 bindsym Mod3+F12 exec screen-locker.sh
-bindsym Print exec upshot
+bindsym Print exec upshot-xbindkeys
 
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +10% #increase sound volume
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -10% #decrease sound volume
@@ -62,7 +62,8 @@ bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -10% #
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run
+#bindsym $mod+d exec dmenu_run
+bindsym $mod+d exec rofi -show run
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
diff --git a/.i3/conkyrc b/.i3/conkyrc
index bf66067..87e7714 100644
--- a/.i3/conkyrc
+++ b/.i3/conkyrc
@@ -20,13 +20,13 @@ TEXT
  ${if_match "${mpd_status}" == "Playing"}{ "full_text" : "${mpd_artist} - ${mpd_title} (${mpd_vol}%)", "color" : "\#d466138"},${endif}
  { "full_text" : "intern0 ${upspeed intern0}\u2191 ${downspeed intern0}\u2193", "color" : "\#00FF00"},
  ${if_up guest0}{ "full_text" : "guest0 ${upspeed guest0}\u2191 ${downspeed guest0}\u2193", "color" : "\#FF0000"},${endif}
- { "full_text" : "IO ${diskio_read}\u2191 ${diskio_write}\u2193"},
+# { "full_text" : "IO ${diskio_read}\u2191 ${diskio_write}\u2193"},
  { "full_text" : "PA ${pa_sink_volume}%"},
  { "full_text" : "/ ${fs_free /}"},
  { "full_text" : "/home ${fs_free /home}"},
- { "full_text" : "CPU ${cpu cpu}%"},
+ { "full_text" : "CPU ${cpu cpu}%", "color": "\#55ff55"},
  { "full_text" : "RAM ${mem} (${memperc}%)" , "color" :
-    ${if_match ${memperc}<80}"\#ffffff"${else}"\#ff0000"${endif} },
+    ${if_match ${memperc}<80}"\#55ff55"${else}"\#ff0000"${endif} },
  { "full_text" : "${loadavg} ${running_threads}/${processes}"},
  { "full_text" : "Up ${uptime}"},
  { "full_text" : "${time %a %F %H:%M:%S}"}
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
-Subproject 8b1fba22cc50c2fd004881ebc6fc64246fe8459
+Subproject 95a44c22cf3d2d9a151f5a9e77824d1ea28ec82
diff --git a/.vim/bundle/editorconfig-vim b/.vim/bundle/editorconfig-vim
new file mode 160000
+Subproject f62d9ed92f8616ad84753b499fe86e782471cc7
diff --git a/.vim/bundle/perlomni.vim b/.vim/bundle/perlomni.vim
new file mode 160000
+Subproject 9a87ff71564a0eb23ce0c496b930366c71de7b5
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
-Subproject fe436371b4043714562c35735ee29690c900d15
+Subproject d7338f8a635514270b441e381164ec477a2e0cf
diff --git a/.vim/bundle/ultisnips b/.vim/bundle/ultisnips
-Subproject 1971030b506a8f0e2e0398fb166f21a5341f8c7
+Subproject 5352d98f212e273b3e8b1d84efdbe2d6a6d557e
diff --git a/.vim/bundle/unite.vim b/.vim/bundle/unite.vim
-Subproject f8c0c00cf33f61663bdc02aa3b3a4565d86162e
+Subproject 97e634117ff05d3c867d625940da5c7947cebf6
diff --git a/.vim/bundle/vim-action-ag b/.vim/bundle/vim-action-ag
new file mode 160000
+Subproject 79be54ffe4af7ec5f98329f4a3b701b6e95b538
diff --git a/.vim/bundle/vim-php-refactoring-toolbox b/.vim/bundle/vim-php-refactoring-toolbox
-Subproject 41e4a2464644ccdc4179b185edb5be57de9009a
+Subproject 9a97fe73c4b0388eee3c08894ba8c9f6435a23f
diff --git a/.vimrc b/.vimrc
index f82c723..c3441c7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -86,6 +86,7 @@ Plugin 'tpope/vim-repeat'
 
 Plugin 'SudoEdit'
 Plugin 'rking/ag.vim'
+Plugin 'Chun-Yang/vim-action-ag'
 Plugin 'scrooloose/nerdtree'
 Plugin 'majutsushi/tagbar'
 
@@ -100,6 +101,8 @@ Plugin 'joonty/vim-phpqa.git'
 
 Plugin 'jamessan/vim-gnupg'
 
+Plugin 'editorconfig/editorconfig-vim'
+
 call vundle#end()
 syntax on
 filetype plugin indent on
@@ -184,6 +187,17 @@ inoremap <F2> <ESC>:NERDTreeToggle<CR>
 
 let python_highlight_all = 1
 
+" Syntastic
+let g:syntastic_enable_perl_checker = 1
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+autocmd BufRead,BufNewFile PKGBUILD let g:syntastic_auto_loc_list = 0
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+let g:syntastic_perl_perlcritic_post_args = '--verbose "\%s:\%f:\%l:\%c: \%p: \%m\n"'
+
+
 " Ultisnips
 let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsExpandTrigger="<c-j>"
diff --git a/.zshrc b/.zshrc
index cb70456..7917fbe 100644
--- a/.zshrc
+++ b/.zshrc
@@ -203,8 +203,9 @@ export VISUAL=$EDITOR
 export PAGER=less
 if type vimpager &>/dev/null; then
 	export MANPAGER=vimpager
-	export PERLDOC_PAGER=vimpager
 fi
+export PERLDOC_PAGER=less
+export PERLDOC="-MPod::Text::Color::Delight"
 export LESSCHARSET="UTF-8"
 export LESSOPEN='|/usr/bin/lesspipe.sh %s 2>&-'
 export LESS='-i -n -w -M -R -P%t?f%f \
@@ -239,12 +240,12 @@ prompt_eof_setup() {
 
 prompt_eof_setup "$@"
 # }}}
-# Prompt {{{ 
+# Prompt {{{
 
 # necessary if you want to use functions in the prompt
 # without this they wouldn't be run again
 #precmd () {
-# this has to be on the edge or you have some spaces in the prompt 
+# this has to be on the edge or you have some spaces in the prompt
 # if you have any workaround please tell
 if [[ $UID != 0 ]]; then
   local username_color=$p_blue