Routine updates

9 files changed, 65 insertions, 85 deletions

diff --git a/bash_aliases b/bash_aliases
index bfd655f..a92723d 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -11,10 +11,10 @@ alias remouse='sudo modprobe -r bcm5974'
 alias enmouse='sudo modprobe bcm5974'
 
 # Notes
-alias physics='nvim ~/Sync/Notes/Physics/physics.txt'
-alias chemistry='nvim ~/Sync/Notes/Chemistry/chemistry.txt'
-alias english='nvim ~/Sync/Notes/English/english.txt'
-alias swedish='nvim ~/Sync/Notes/Swedish/swedish.txt'
+alias physics='vim ~/Sync/Notes/Physics/physics.txt'
+alias chemistry='vim ~/Sync/Notes/Chemistry/chemistry.txt'
+alias english='vim ~/Sync/Notes/English/english.txt'
+alias swedish='vim ~/Sync/Notes/Swedish/swedish.txt'
 
 #zombify
 alias zombify='sudo -u dork /home/vasko/dorknet/dork zombify'
@@ -46,8 +46,8 @@ alias r='rm'
 alias md='mkdir'
 alias rd='rm -rf'
 alias c='gcp'
-alias v='nvim'
-alias sv='sudo nvim'
+alias v='vim'
+alias sv='sudo vim'
 alias f='gnome-commander'
 alias o='less'
 alias g='wget'
@@ -98,19 +98,19 @@ alias ftpumount='umount /home/vasko/ftp'
 
 alias desk='cd ~/Desktop' 
 alias cbb='cat /proc/acpi/bbswitch' 
-alias vimrc='nvim ~/.vimrc'
-alias uzblrc='nvim ~/.config/uzbl/config'
-alias aliases='nvim ~/.bash_aliases'
+alias vimrc='vim ~/.vimrc'
+alias uzblrc='vim ~/.config/uzbl/config'
+alias aliases='vim ~/.bash_aliases'
 alias solarize='~/.solarized/solarize'
-alias rat='nvim ~/.ratpoison/ratpoisonrc.conf'
-alias sx='nvim ~/.config/sxhkd/sxhkdrc'
-alias bs='nvim ~/.config/bspwm/bspwmrc'
-alias screenrc='nvim ~/.ratpoison/screenrc'
-alias xkb='sudo nvim /usr/share/X11/xkb/symbols/us'
+alias rat='vim ~/.ratpoison/ratpoisonrc.conf'
+alias sx='vim ~/.config/sxhkd/sxhkdrc'
+alias bs='vim ~/.config/bspwm/bspwmrc'
+alias screenrc='vim ~/.ratpoison/screenrc'
+alias xkb='sudo vim /usr/share/X11/xkb/symbols/us'
 alias pdf='apvlv'
 alias kpaint='kolourpaint'
 alias gnu='vrms'
-alias layout='nvim .rat_layout'
+alias layout='vim .rat_layout'
 alias lightdm='sudo /etc/init.d/lightdm start'
 alias mountem='sudo mount -t auto /dev/sda5 /mnt/sda5'
 alias grub='sudo -e /etc/default/grub'
diff --git a/bashrc b/bashrc
index fed088c..d78accc 100644
--- a/bashrc
+++ b/bashrc
@@ -118,6 +118,6 @@ shopt -s cdspell
 
 export GPGKEY="B54608CC"
 export PATH="$HOME/bin:$HOME/bin/perl6:$PATH"
-export EDITOR="vim"
+export EDITOR="nvim"
 export PENTADACTYL_RUNTIME="$HOME/.pentadactyl"
 export LD_LIBRARY_PATH=/usr/local/lib       
diff --git a/tools/wp b/tools/wp
index 072cf77..c508adb 100755
--- a/tools/wp
+++ b/tools/wp
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 function main {
 
   # Snippet from SO user Dave Dopson http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
diff --git a/vim/bundle/vim-easymotion b/vim/bundle/vim-easymotion
deleted file mode 160000
-Subproject c87f91d712d77ba883e0d8f8ff6effdee0c1ddf
diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat
deleted file mode 160000
-Subproject 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef
diff --git a/vimperatorrc b/vimperatorrc
index 61d8c84..76c7ba3 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -43,8 +43,8 @@ nnoremap l gt
 nnoremap h gT
 nnoremap s <C-d>
 nnoremap e <C-u>
-nnoremap w :open<Space>wikilocal<Space>
-nnoremap W :open<Space>wikipedia<Space>
+nnoremap W :open<Space>wikilocal<Space>
+nnoremap w :open<Space>wikipedia<Space>
 nnoremap x d
 nnoremap ( H
 nnoremap ) L
diff --git a/vimrc b/vimrc
index 1843bfa..7f602a7 100644
--- a/vimrc
+++ b/vimrc
@@ -1,48 +1,46 @@
-execute pathogen#infect()
-" All system-wide defaults are set in $VIMRUNTIME/debian.vim (usually just
-" /usr/share/vim/vimcurrent/debian.vim) and sourced by the call to :runtime
-" you can find below.  If you wish to change any of those settings, you should
-" do it in this file (/etc/vim/vimrc), since debian.vim will be overwritten
-" everytime an upgrade of the vim packages is performed.  It is recommended to
-" make changes after sourcing debian.vim since it alters the value of the
-" 'compatible' option.
-
-" This line should not be removed as it ensures that various options are
-" properly set to work with the Vim-related packages available in Debian.
-runtime! debian.vim
-
-" Uncomment the next line to make Vim more Vi-compatible
-" NOTE: debian.vim sets 'nocompatible'.  Setting 'compatible' changes numerous
-" options, so any other options should be set AFTER setting 'compatible'.
-"set compatible
-
-" Vim5 and later versions support syntax highlighting. Uncommenting the next
-" line enables syntax highlighting by default.
-if has("syntax")
-  syntax on
-endif
-
-" If using a dark background within the editing area and syntax highlighting
-" turn on this option as well
-"set background=dark
-
-" Uncomment the following to have Vim jump to the last position when
-" reopening a file
-"if has("autocmd")
-"  au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
-"endif
-
-" Uncomment the following to have Vim load indentation rules and plugins
-" according to the detected filetype.
-"if has("autocmd")
-"  filetype plugin indent on
-"endif
-
-" The following are commented out as they cause vim to behave a lot
-" differently from regular Vi. They are highly recommended though.
+set nocompatible              " be iMproved, required
+filetype off                  " required
+
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'scrooloose/syntastic'
+
+Plugin 'SirVer/ultisnips'
+Plugin 'honza/vim-snippets'
+
+Plugin 'tpope/vim-surround'
+
+
+
+call vundle#end()            " required
+filetype plugin indent on    " required
+
+"Syntatic settings
+let g:syntastic_enable_perl_checker = 1
+let g:syntastic_perl_checkers = ['perl']
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+
+
+" Ultisnips
+let g:UltiSnipsExpandTrigger="<leader>c"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+
+"General
+syntax on
+
 set showcmd		" Show (partial) command in status line.
 "set showmatch		" Show matching brackets.
-set gdefault
+"set gdefault
 set ignorecase		" Do case insensitive matching
 set smartcase		" Do smart case matching
 set incsearch		" Incremental search
@@ -51,22 +49,10 @@ set incsearch		" Incremental search
 "set hidden             " Hide buffers when they are abandoned
 "set mouse=a		" Enable mouse usage (all modes)
 
-" Source a global configuration file if available
-if filereadable("/etc/vim/vimrc.local")
-  source /etc/vim/vimrc.local
-endif
-
 "set number
 "set spell
 set ruler
 
-
-"Solarized settings
-set background=light
-set t_Co=256
-"colorscheme solarized
-"setlocal fo+=aw
-
 "Autosave and Autoread
 set autoread
 set autowriteall
@@ -86,10 +72,6 @@ let Tex_FoldedSections=""
 let Tex_FoldedEnvironments=""
 let Tex_FoldedMisc=""
 
-"For god sake make line numbers usefull
-"set relativenumber
-
-
 "Persisten-undo magic
 set undofile
 
@@ -101,7 +83,7 @@ nnoremap j gj
 nnoremap k gk
 
 "set leader to comma
-let mapleader = "\<Space>"
+let mapleader = ","
 
 
 "Math with qalc
diff --git a/xinitrc b/xinitrc
index fb0eef5..b15bb8e 100755
--- a/xinitrc
+++ b/xinitrc
@@ -67,7 +67,7 @@ xrdb -merge ~/.Xdefaults
 #dropbox start
 ~/bin/offline-run &
 #xflux -z 24531 -l 56 -g 13
-#sudo nm-applet &
+nm-applet &
 
 #Disable annoying point tap
 synclient PalmDetect=1
@@ -134,8 +134,7 @@ fi
 # workspace 3 : newsbeuter
 if [ $run_everything = true -o $run_workspace = 3 ]; then
     $workspace ^2
-#    Memory leak in newsbeuter
-#    $xtoolwait $term newsbeuter
+    $xtoolwait $term newsbeuter
 fi
 
 # workspace 4 : admin workspace
@@ -203,8 +202,8 @@ fi
 #     window 1: music 
 if [ $run_everything = true -o $run_workspace = 2 ]; then
     $workspace ^11
-    mopidy &
-    $xtoolwait $term ncmpc
+    mpd &
+    $xtoolwait $term ncmpcpp
 fi
 
 # workspace 13 : volume workspace
diff --git a/zshrc b/zshrc
index 455185b..51d5e1d 100644
--- a/zshrc
+++ b/zshrc
@@ -23,7 +23,7 @@ source ~/.bash_aliases
 
 export GPGKEY="895134C5"
 export PATH="$HOME/bin:$PATH"
-export EDITOR="vim"
+export EDITOR="nvim"
 export BROWSER="~/.ratposon/firesend"
 export LD_LIBRARY_PATH=/usr/local/lib
 export wiki_browser='firefox'