aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bash_aliases36
-rw-r--r--vimperatorrc2
-rw-r--r--vimrc10
-rwxr-xr-xxinitrc8
4 files changed, 30 insertions, 26 deletions
diff --git a/bash_aliases b/bash_aliases
index ddc2521..bfd655f 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='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'
+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'
#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='vim'
-alias sv='sudo vim'
+alias v='nvim'
+alias sv='sudo nvim'
alias f='gnome-commander'
alias o='less'
alias g='wget'
@@ -67,6 +67,10 @@ alias pglxspheres='vblank_mode=0 primusrun /opt/VirtualGL/bin/glxspheres64'
alias httpserve='python -m SimpleHTTPServer'
alias pi='ping google.com'
alias pl='ping 8.8.8.8'
+alias def='sdcv'
+
+
+alias aria2c='aria2c -c -x5 -s10 -m0'
#msf
@@ -94,22 +98,22 @@ alias ftpumount='umount /home/vasko/ftp'
alias desk='cd ~/Desktop'
alias cbb='cat /proc/acpi/bbswitch'
-alias vimrc='vi ~/.vimrc'
-alias uzblrc='vi ~/.config/uzbl/config'
-alias aliases='vi ~/.bash_aliases'
+alias vimrc='nvim ~/.vimrc'
+alias uzblrc='nvim ~/.config/uzbl/config'
+alias aliases='nvim ~/.bash_aliases'
alias solarize='~/.solarized/solarize'
-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 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 pdf='apvlv'
alias kpaint='kolourpaint'
alias gnu='vrms'
-alias layout='vi .rat_layout'
+alias layout='nvim .rat_layout'
alias lightdm='sudo /etc/init.d/lightdm start'
alias mountem='sudo mount -t auto /dev/sda5 /mnt/sda5'
-alias grub='sudo vi /etc/default/grub'
+alias grub='sudo -e /etc/default/grub'
alias reboot='sudo reboot'
# Games
diff --git a/vimperatorrc b/vimperatorrc
index acff0ba..61d8c84 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -56,4 +56,4 @@ set gui=nonavigation
source! /home/vasko/.vimperatorrc.local
" vim: set ft=vimperator:
-set defsearch=crypted
+set defsearch=duk
diff --git a/vimrc b/vimrc
index 4971e3a..1843bfa 100644
--- a/vimrc
+++ b/vimrc
@@ -113,11 +113,11 @@ nnoremap <leader>v :!open '<cfile>'<CR>
set isfname+=32
"Make tab into another escape
-nnoremap <Tab> <Esc>
-vnoremap <Tab> <Esc>gV
-onoremap <Tab> <Esc>
-inoremap <Tab> <Esc>`^
-inoremap <S-Tab> <Tab>
+"nnoremap <Tab> <Esc>
+"vnoremap <Tab> <Esc>gV
+"onoremap <Tab> <Esc>
+"inoremap <Tab> <Esc>`^
+"inoremap <S-Tab> <Tab>
set enc=utf-8
"sync paste buffer and vims register
diff --git a/xinitrc b/xinitrc
index c41274e..fb0eef5 100755
--- a/xinitrc
+++ b/xinitrc
@@ -65,8 +65,8 @@ xrdb -merge ~/.Xresources
xrdb -merge ~/.Xdefaults
# Start some programs
#dropbox start
-~/bin/offline-run
-#~/bin/xflux -z 24531 -l 56 -g 13
+~/bin/offline-run &
+#xflux -z 24531 -l 56 -g 13
#sudo nm-applet &
#Disable annoying point tap
@@ -203,8 +203,8 @@ fi
# window 1: music
if [ $run_everything = true -o $run_workspace = 2 ]; then
$workspace ^11
- mpd
- $xtoolwait $term ncmpcpp
+ mopidy &
+ $xtoolwait $term ncmpc
fi
# workspace 13 : volume workspace