Merge branch 'master' of github.com:Vaskozl/dotfiles

14 files changed, 83 insertions, 99 deletions

diff --git a/LICENSE b/LICENSE
index a9416b4..59fd821 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 	DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 		Version 2, December 2004
 
-Copyright (C) 0x7D Vasil Zlatanov <vasil.zlatanov@gmail.com>
+Copyright (C) 0x7DF Vasil Zlatanov <vasil.zlatanov@gmail.com>
 
 Everyone is permitted to copy and distribute verbatim or modified
 copies of this license document, and changing it is allowed as long
diff --git a/bash_aliases b/bash_aliases
index 73ffad8..bf2c17a 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -65,6 +65,8 @@ alias iso='dd if=/dev/cdrom of=~/cdrom_image.iso'
 alias tglxspheres='vblank_mode=0 optirun -vv /opt/VirtualGL/bin/glxspheres64'
 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'
 
 
 # Screen
@@ -120,7 +122,7 @@ alias starbound="~/games/starbound/linux64/launch_starbound.sh"
 # Network tools
 
 #scan available networks
-alias wifi='sudo nmcli dev wifi'
+alias wifi='sudo wpa_supplicant -i wlp2s0 -c /etc/wpa_supplicant/wpa_supplicant-wlp2s0.conf'
 
 alias ipscan='nmap -sP'
 alias localscan='sudo nmap -PR -sP 192.168.0.1/24'
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index b5e48f1..1a191ff 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -135,7 +135,7 @@ super + s
 	skype
 
 super + shift + L
-	i3lock -n -i ~/.wallpaper.png -z
+	~/.ratpoison/lock
 
 
 #
@@ -183,19 +183,19 @@ grave;  g
 #
 
 super + space 
-	mpc -h 127.0.0.1 toggle  && ~/.ratpoison/panel/monce > /tmp/panel-fifo
+	mpc -h 127.0.0.1 toggle 
 
 super + Right 
-	mpc -h 127.0.0.1 next  && echo "p`mpc current`" | cut --bytes 1-32 > /tmp/panel-fifo
+	mpc -h 127.0.0.1 next 
 
 super + Left  
-	mpc -h 127.0.0.1 prev  && echo "p`mpc current`" | cut --bytes 1-32 > /tmp/panel-fifo
+	mpc -h 127.0.0.1 prev
 
 super + Up    
-	mpc -h 127.0.0.1 volume +5 && mpc -h 127.0.0.1 volume | perl -pe 's/^volume://' | perl -pe 's/%$//' | perl -pe 's/^ /K/' > /tmp/panel-fifo 
+	mpc -h 127.0.0.1 volume +5
 
 super + Down  
-	mpc -h 127.0.0.1 volume -5 && mpc -h 127.0.0.1 volume | perl -pe 's/^volume://' | perl -pe 's/%$//' | perl -pe 's/^ /K/' > /tmp/panel-fifo 
+	mpc -h 127.0.0.1 volume -5
 
 XF86AudioRaiseVolume
 	amixer -q set Master 5+ && volume -f 'V%i' > /tmp/panel-fifo 
diff --git a/msmtprc b/msmtprc
index 180af12..74aa1fa 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,4 +1,4 @@
-account default 
+account bitmessage 
 host mail.bitmessage.ch
 port 465
 protocol smtp
@@ -9,7 +9,7 @@ tls on
 tls_starttls off
 tls_nocertcheck
 
-account gmail 
+account default 
 host smtp.gmail.com
 port 587
 protocol smtp
diff --git a/muttrc b/muttrc
index 8be11f7..d02a87d 100644
--- a/muttrc
+++ b/muttrc
@@ -15,23 +15,31 @@ set mbox_type   = Maildir
 set sendmail    = /usr/bin/msmtp
 
 set folder      = ~/.mail/
-
-set spoolfile = "+Swiss/INBOX"
-#set mbox = "+Swiss/archive"
-set postponed = "+Swiss/INBOX.Drafts"
-set record = "+Swiss/INBOX.Sent"
-set copy=yes
+set spoolfile   = "+Gmail/INBOX"
+set mbox        = "+Gmail/archive"
+set postponed   = "+Gmail/drafts"
+unset record
 
 mailboxes +INBOX
 
-# Bitmessage conf
-set from = "vasco@bitmessage.ch"
+macro index D \
+    "<save-message>+Gmail/trash<enter>" \
+    "move message to the trash"
+
+macro index S \
+    "<save-message>+Gmail/spam<enter>" \
+    "mark message as spam"
+
+
+# Gmail conf
+set from = "vasil.zlatanov@gmail.com"
 set realname = "Vasil Zlatanov"
 
 # Change the following line to a different editor you prefer.
 set editor = "vim"
 
 # Basic config, you can leave this as is
+#set hostname = gmail.com
 set mail_check = 1
 set timeout = 1
 unset imap_passive
@@ -67,12 +75,13 @@ ignore x-alt-email x-orcpt company division x-warning
 
 
 # Gmail-style keyboard shortcuts
-macro index,pager gi "<change-folder>=Swiss/INBOX<enter>" "Go to inbox"
-macro index,pager gs "<change-folder>=Swiss/INBOX.Sent<tab><enter>" "Go to sent mail"
-macro index,pager gt "<change-folder>=Swiss/INBOX.Trash<enter>" "Go to trash"
-macro index,pager gd "<change-folder>=Swiss/INBOX.Drafts<enter>" "Go to drafts"
-
-
+macro index,pager gi "<change-folder>=Gmail/INBOX<enter>" "Go to inbox"
+macro index,pager ga "<change-folder>=Gmail/archive<tab><enter>" "Go to all mail"
+macro index,pager gs "<change-folder>=Gmail/sent<tab><enter>" "Go to sent mail"
+macro index,pager gr "<change-folder>=Gmail/flagged<enter>" "Go to starred messages"
+macro index,pager gj "<change-folder>=Gmail/spam<enter>" "Go to spam"
+macro index,pager gt "<change-folder>=Gmail/trash<enter>" "Go to trash"
+macro index,pager gd "<change-folder>=Gmail/drafts<enter>" "Go to drafts"
 
 # Other config
 set delete 
@@ -82,17 +91,16 @@ unset help
 set pager_stop
 
 # Bindings 
-macro index,pager d "<delete-message>"
 bind index,pager "n" next-unread
 bind index,pager "N" search-next
 
-bind browser s half-down
-bind index s half-down
-bind pager s half-down
+bind browser d half-down
+bind index d half-down
+bind pager d half-down
 
-bind browser e half-up
-bind index e half-up
-bind pager e half-up
+bind browser u half-up
+bind index u half-up
+bind pager u half-up
 
 bind index gg       first-entry
 bind pager gg       top
diff --git a/offlineimaprc b/offlineimaprc
index 6f2fe00..4fa56d4 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,6 +1,6 @@
 [general]
 ui = ttyui
-accounts = BitMessage
+accounts = Gmail
 # This will suppress anything but errors
 ui = quiet
 
diff --git a/pentadactylrc b/pentadactylrc
index 9c1e688..82bdd61 100644
--- a/pentadactylrc
+++ b/pentadactylrc
@@ -123,7 +123,7 @@ map -count -modes=n,v ( <count>H
 map -count -modes=n,v ) <count>L
 set autocomplete=
 "set defsearch=startpage-https
-set defsearch=google
+set defsearch=startpage
 set editor='rxvt -e sh -c "vim +<line> +\"sil! call cursor(0, <column>)\" <file>"'
 set strictfocus=*:despotic
 
diff --git a/ratpoison/panel/music b/ratpoison/panel/music
index 3de320d..caec3d7 100755
--- a/ratpoison/panel/music
+++ b/ratpoison/panel/music
@@ -1,25 +1,8 @@
 #!/bin/sh
 
-
-f=1
-d=30 # width
-
 while true;do
 
 new=`mpc current` 
-if [ "$old" != "$new" ];then 
-f=1;
-old="$new"
-fi
-
-
-e=$(expr $f + $d)
-
-if [ $e -gt ${#new} ];then
-e=${#new}
-f=$(expr $e - $d)
-if [ $f -lt 1 ];then f=1;fi
-fi
 
 if mpc | grep -q playing; then  
 symbol='p'
@@ -27,17 +10,7 @@ else
 symbol='P'
 fi
 
-echo $f
-echo $e
-echo ${#new}
-echo "$symbol`echo $new | cut --bytes $f-$e`"
+echo "$symbol`echo $new | cut --bytes 1-30`"
 echo "K`mpc -h 127.0.0.1 volume | perl -pe 's/^volume://' | perl -pe 's/%$//' | perl -pe 's/^ //'`"
-
-f=$(expr $d / 2 + $f)
-
-if [ $e == ${#new} ];then
-f=1;
-fi
-
-sleep 2;
+mpc idle > /dev/null
 done
diff --git a/ratpoison/panel/panel b/ratpoison/panel/panel
index 95b8aa4..b998d0b 100755
--- a/ratpoison/panel/panel
+++ b/ratpoison/panel/panel
@@ -9,13 +9,13 @@ mkfifo "$PANEL_FIFO"
 bspc config top_padding $PANEL_HEIGHT
 bspc control --subscribe > "$PANEL_FIFO" &
 xtitle -sf 'T%s' > "$PANEL_FIFO" &
-essid -sf 'E%s' -i 3 -w wlp2s0 > "$PANEL_FIFO" &
-volume -i 10 -sf 'V%i' > "$PANEL_FIFO" &
-battery -i 5 -sf 'B%i' > "$PANEL_FIFO" &
-clock -sf 'Z%d %a %H:%M' > "$PANEL_FIFO" &
+volume -f 'V%i' > "$PANEL_FIFO" &
+battery -i 60 -sf 'B%i' > "$PANEL_FIFO" &
+clock -i 60 -sf 'Z%d %a %H:%M' > "$PANEL_FIFO" &
 ./music > "$PANEL_FIFO" &
-./load > "$PANEL_FIFO" &
-./signal > "$PANEL_FIFO" &
+#essid -sf 'E%s' -i 30 -w wlp2s0 > "$PANEL_FIFO" &
+# ./load > "$PANEL_FIFO" &
+# ./signal > "$PANEL_FIFO" &
 
 
 source ./panel_colors
diff --git a/ratpoison/panel/panel_bar b/ratpoison/panel/panel_bar
index 6ccf74b..24ec723 100755
--- a/ratpoison/panel/panel_bar
+++ b/ratpoison/panel/panel_bar
@@ -8,19 +8,16 @@ num_mon=$(bspc query -M | wc -l)
 while read -r line ; do
 source ./panel_colors
 	case $line in
-		C*)
-			# playing mpc 
-			cpu="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} C:${line#?} %{B-}%{F-}"
-			;;
-		R*)
-			# playing mpc 
-			ram="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} R:${line#?} %{B-}%{F-}"
-			;;
-	
-		S*)
-			# playing mpc 
-			signal="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} S:${line#?} %{B-}%{F-}"
-			;;
+#		C*)
+#			cpu="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} C:${line#?} %{B-}%{F-}"
+#			;;
+#		R*)
+#			ram="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} R:${line#?} %{B-}%{F-}"
+#			;;
+#	
+#		S*)
+#			signal="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} S:${line#?} %{B-}%{F-}"
+#			;;
 	
 		p*)
 			# playing mpc 
@@ -40,7 +37,7 @@ source ./panel_colors
 	
 	
 		B*)
-			# volume output
+			# battery output
 			battery="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} B:${line#?} %{B-}%{F-}"
 			;;
 	
@@ -50,14 +47,14 @@ source ./panel_colors
 			volume="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} V:${line#?} %{B-}%{F-}"
 			;;
 	
-		E*)
-			# essid output
-                        if [ -z ${line#?} ];then 
-			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:No WiFi  %{B-}%{F-}"
-                        else
-			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:${line#?} %{B-}%{F-}"
-                        fi
-			;;
+#		E*)
+#			# essid output
+#                        if [ -z ${line#?} ];then 
+#			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:No WiFi  %{B-}%{F-}"
+#                        else
+#			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:${line#?} %{B-}%{F-}"
+#                        fi
+#			;;
 	
 		Z*)
 			# clock output
@@ -121,5 +118,6 @@ source ./panel_colors
 			done
 			;;
 	esac
-	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos}             "
+#	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos}             "
+	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${volume}${musicvol}${battery}${time_infos}             "
 done
diff --git a/rtorrent.rc b/rtorrent.rc
index 66d180c..3318917 100755
--- a/rtorrent.rc
+++ b/rtorrent.rc
@@ -1,4 +1,4 @@
-# This is an example resource file for rTorrent. Copy to
+# This is an example rerource file for rTorrent. Copy to
 # ~/.rtorrent.rc and enable/modify the options as needed. Remember to
 # uncomment the options you wish to enable.
 
@@ -20,7 +20,7 @@ ratio.max.set=200
 #upload_rate = 0
 
 # Default directory to save the downloaded torrents.
-directory = ~/Downloads
+directory = ~/Torrents
 
 # Default session directory. Make sure you don't run multiple instance
 # of rtorrent using the same session directory. Perhaps using a
@@ -29,7 +29,7 @@ session = ~/.rtorrent.session
 
 # Watch a directory for new torrents, and stop those that have been
 # deleted.
-schedule = watch_directory,5,5,load_start=~/Torrents/*.torrent
+schedule = watch_directory,5,5,load_start=~/Downloads/*.torrent
 schedule = untied_directory,5,5,stop_untied=
 
 # Prevent low disk space shit
diff --git a/vimperatorrc b/vimperatorrc
index 9acb7a4..acff0ba 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -49,6 +49,8 @@ nnoremap x d
 nnoremap ( H
 nnoremap ) L
 nnoremap gi gi<End>
+nnoremap a :open<Space>archwiki<Space>
+nnoremap A :open<Space>aur<Space>
 set focuscontent
 set gui=nonavigation
 source! /home/vasko/.vimperatorrc.local
diff --git a/xinitrc b/xinitrc
index 9de33db..3ad6809 100755
--- a/xinitrc
+++ b/xinitrc
@@ -48,7 +48,7 @@ xset m 0 0
 xset -b
 
 # Launch locking program
-xautolock -detectsleep -locker 'i3lock -i ~/.wallpaper.png -z' -time 11 -corners 0-00 &
+#xautolock -detectsleep -locker '~/.ratpoison/lock' -time 11 -corners 0-00 &
 
 # Load xterm colors
 xrdb -merge ~/.Xresources
@@ -91,7 +91,7 @@ fi
 sxhkd &
 if [ $run_everything = true ]; then
     bspwm 2>&1 &
-    compton & 
+#    compton & 
     wmpid=$!
     sleep 1 &
 fi
@@ -191,8 +191,8 @@ fi
 #     window 1: music 
 if [ $run_everything = true -o $run_workspace = 2 ]; then
     $workspace ^12
-    cd $HOME/Music	
-    $xtoolwait $term cmus
+    mpd
+    $xtoolwait $term ncmpcpp
 fi
 
 # workspace 13 : volume workspace
@@ -205,7 +205,7 @@ fi
 # workspace 2 : Uzbl workspace
 if [ $run_everything = true -o $run_workspace = 2 ]; then
     $workspace ^2
-    uzbl-browser &
+    firefox &
 fi
 
 # Default workspace: 1(ranger)
diff --git a/zshrc b/zshrc
index 1250b99..7c8218f 100644
--- a/zshrc
+++ b/zshrc
@@ -27,6 +27,7 @@ export EDITOR="vim"
 export BROWSER="~/.ratposon/firesend"
 export PENTADACTYL_RUNTIME="$HOME/.pentadactyl"
 export LD_LIBRARY_PATH=/usr/local/lib
+export wiki_browser='firefox'
 
 PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}☢ "
 RPROMPT="[%{$fg_no_bold[yellow]%}%?%{$reset_color%}]"