misc changes

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

4 files changed, 18 insertions, 14 deletions

diff --git a/.Xdefaults b/.Xdefaults
index ba57c1e..93ee91d 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -38,6 +38,7 @@ URxvt*background: rgba:0000/0000/0000/eeee
 !URxvt*transparent:true
 URxvt*tintColor: #141414
 URxvt.termName: rxvt-256color
+URxvt.lineSpace: 2
 
 !--------------------
 ! Overall Settings
diff --git a/.htoprc b/.htoprc
index bce7ba9..614456a 100644
--- a/.htoprc
+++ b/.htoprc
@@ -6,7 +6,7 @@ sort_key=39
 sort_direction=1
 hide_threads=0
 hide_kernel_threads=1
-hide_userland_threads=1
+hide_userland_threads=0
 shadow_other_users=1
 highlight_base_name=1
 highlight_megabytes=1
diff --git a/.vimrc b/.vimrc
index 67bba75..7c1bddb 100644
--- a/.vimrc
+++ b/.vimrc
@@ -29,17 +29,18 @@ set scrolloff=3
 set showcmd
 set display=uhex
 set list
-set listchars=tab:▸\ ,eol:$
+set listchars=tab:>\ ,eol:$
 set hidden
 set display+=lastline
 set undofile
+set cursorline
 
 let mapleader = ","
 
 "aliases
-ca w!! w !sudo tee "%" > /dev/null
-ca fb w !fb<CR>
-ca qpd %!perl -pe 's/\=([0-9A-Fa-f]{2})/chr(hex($1))/ge; s/\=\n//;'
+cnorea w!! w !sudo tee "%" > /dev/null
+"cnorea fb w !fb<CR>
+cnorea qpd %!perl -pe 's/\=([0-9A-Fa-f]{2})/chr(hex($1))/ge; s/\=\n//;'
 
 let g:qname_hotkey = "<C-b>"
 
@@ -60,8 +61,6 @@ endif
 
 set runtimepath+=/usr/share/vim
 
-"inoremap <tab> <c-n>
-
 let python_highlight_all = 1
 
 " common save shortcuts
@@ -96,6 +95,7 @@ nmap <silent> ,s :set spell!<CR>
 
 autocmd FileType make setlocal noexpandtab
 au FileType python set ts=4 sw=4 softtabstop=4 et
+autocmd BufRead,BufNewFile PKGBUILD let is_bash=1 | set ft=sh
 
 "colorscheme gardener
 "colorscheme desert256
@@ -138,5 +138,5 @@ else
   set guifont=Dejavu\ Sans\ Mono\ 7
   "set guioptions-=m
   set guioptions-=T
-  set lines=45 columns=125
+  set lines=80 columns=125
 endif
diff --git a/.xinitrc b/.xinitrc
index 7f132d2..430f290 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -16,7 +16,8 @@ urxvtd -o -f -q
 xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 5 &
 
 autostart () {
-  sh $HOME/bin/irssi_notify.sh < /dev/null & # also in ~/bin/suspend-resume.sh
+	notipy.py -a SOUTH_EAST -m 0,1920,0,0 &
+  $HOME/bin/irssi_notify.sh & # also in ~/bin/suspend-resume.sh
   urxvt -g 125x+45+1166+0 -e ssh mistral &
   urxvt -g 125x+45+1920+0 -e ssh karif &
   stalonetray --dockapp-mode -p --kludges force_icons_size &
@@ -24,8 +25,10 @@ autostart () {
   for f in $XDG_CONFIG_HOME/conky/*; do
     conky -c "$f" &
   done
+	rm $HOME/passwords.kdb.lock
   keepassx&
-  transmission-qt &
+#  transmission-qt &
+  transmission-remote-gtk &
 #  psi &
   gajim &
 #  /opt/Samsung/SmartPanel/bin/smartpanel &
@@ -42,22 +45,22 @@ autostart () {
 # WM
 case "$1" in
   awesome|i3)
-    ck-launch-session i3 --force-xinerama &
+    i3 --force-xinerama &
     sleep 1
     autostart &
   ;;
   twm)
-    ck-launch-session twm &
+    twm &
     sleep 1
     autostart &
   ;;
   console)
-    ck-launch-session openbox &
+    openbox &
     sleep 1
     urxvt &
   ;;
   *|openbox) 
-    ck-launch-session openbox &
+    openbox &
     sleep 1
     autostart &
   ;;