Resolve conflicts

3 files changed, 8 insertions, 21 deletions

diff --git a/Window_Manager/ratpoison/firesend b/Window_Manager/ratpoison/firesend
deleted file mode 100755
index 70ee78e..0000000
--- a/Window_Manager/ratpoison/firesend
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-vimb $@ > /dev/null 2>&1 &
diff --git a/Window_Manager/ratpoison/py/colorz.pyc b/Window_Manager/ratpoison/py/colorz.pyc
index 2e77075..586db45 100644
--- a/Window_Manager/ratpoison/py/colorz.pyc
+++ b/Window_Manager/ratpoison/py/colorz.pyc
diff --git a/Window_Manager/ratpoison/ratpoisonrc.conf b/Window_Manager/ratpoison/ratpoisonrc.conf
index 8b00a30..702ab68 100644
--- a/Window_Manager/ratpoison/ratpoisonrc.conf
+++ b/Window_Manager/ratpoison/ratpoisonrc.conf
@@ -8,7 +8,8 @@ escape grave
 definekey top s-grave meta
 definekey top Arabic_dammatan meta
 
-#set quiet 1
+# Surpress 'Current Frame'
+set framemsgwait -1
 
 set historyexpansion 1
 
@@ -49,7 +50,7 @@ exec xsetroot -cursor_name left_ptr
 #exec nitrogen --restore
 
 #Border & Padding
-alias showpanel set padding 0 24 0 0
+alias showpanel set padding 0 40 0 0
 alias hidepanel set padding 0 0 0 0
 showpanel
 
@@ -121,15 +122,8 @@ bind W exec sudo connman_dmenu
 bind g exec ~/bin/safeimg
 bind P exec ~/bin/safepaste
 
-alias bordtoggle exec ~/.config/ratpoison/bordtoggle
-alias bordscript exec ~/.config/ratpoison/borderscript
 alias paneltoggle exec ~/.config/ratpoison/paneltoggle
 
-
-
-
-#addhook key bordscript
-
 definekey top s-b bordtoggle
 definekey top s-p paneltoggle
 
@@ -141,7 +135,7 @@ alias cont exec pkill -CONT
 
 
 # b : Open url
-alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 vimb
+alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 chromium-dev --start-fullscreen  --new-window https://google.com
 alias browse colon browse_cmd 
 bind b browse
 # B : open a new firefox tab and browse to the X clipboard selection
@@ -167,7 +161,7 @@ definekey top s-h exec ~/.config/vimb/history-search
 #definekey top s-g exec gvim
 #definekey top s-l exec libreoffice
 
-definekey top s-m exec mbsync -a
+definekey top s-m exec mbsync -a && notmuch new && ratpoison -c 'echo Mail Synced'
 
 #-----------------------------------------------------
 # Voice control
@@ -177,8 +171,6 @@ definekey top KP_Enter exec ~/Dropbox/speech/run-duplex.sh
 #-------------------------------------------------------------
 # Volume Control
 #-------------------------------------------------------------
-# Up
-#alias volup exec amixer -D pulse -q set Master 5+ && ratpoison -c "echo `$HOME/.config/ratpoison/volind`" & volume -f 'V%i' > /tmp/panel-fifo
 alias volup exec pactl set-sink-volume `pactl list sinks short | perl -ne '/^(\d*)/; $x=$1; END { print $x }'` +2% && volume -f 'V%i' > /tmp/panel-fifo
 alias voldown exec pactl set-sink-volume `pactl list sinks short | perl -ne '/^(\d*)/; $x=$1; END { print $x }'` -2% && volume -f 'V%i' > /tmp/panel-fifo
 
@@ -195,16 +187,13 @@ definekey top XF86AudioStop exec dbus-send --print-reply --dest=org.mpris.MediaP
 definekey top XF86AudioNext exec dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next 
 definekey top XF86AudioPrev exec dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous 
 
-# Down
-#alias voldown exec amixer -D pulse -q set Master 5- && ratpoison -c "echo `$HOME/.config/ratpoison/volind`" & volume -f 'V%i' > /tmp/panel-fifo
-
 definekey top XF86AudioLowerVolume voldown
 definekey top M-XF86AudioLowerVolume spvoldown
 definekey top s-Next voldown
 definekey top s-a voldown
 
 # Mute
-alias voltoggle exec amixer -D pulse set Master toggle && ratpoison -c "echo Sound: `amixer get Master|awk '/Mono:/ {print $6}'`"
+alias voltoggle exec amixer set Master toggle && ratpoison -c "echo Sound: `amixer -D sysdefault get Master|awk '/Mono:/ {print $6}'`"
 
 definekey top XF86AudioMute voltoggle
 definekey top s-Pause voltoggle
@@ -212,8 +201,8 @@ definekey top s-Pause voltoggle
 #-------------------------------------------------------------
 # Brightness Control
 #-------------------------------------------------------------
-alias brightup exec xbacklight -inc 2
-alias brightdown exec xbacklight -dec 2
+alias brightup exec light -A 2
+alias brightdown exec light -U 2
 
 definekey top XF86MonBrightnessUp brightup
 definekey top XF86MonBrightnessDown brightdown