Fix many bar bugs and improve ratpoison config

5 files changed, 26 insertions, 176 deletions

diff --git a/config/vimb/command b/config/vimb/command
deleted file mode 100644
index f927161..0000000
--- a/config/vimb/command
+++ /dev/null
@@ -1,148 +0,0 @@
-bind s C-d
-map s C-d
-open vimb config
-open dav.skozl.com
-open https://dav.skozl.com
-open shit
-nnoremap d C-d
-nmap d C-d
-help
-down
-nmap s j
-nmap s ^d
-nmap s C-d
-nmap e 10 k
-nmap e 10k
-map s CTRL-D
-nmap s CTRL-D
-tabopen vimb control
-open !g vimb control
-nmap s 10j
-tabopen !g vimb/config
-open googlecom
-open !g vimb review
-open /tabbed
-open !g vimb grey bar
-tabopen wow
-set editor-command
-set hintkeys
-open !g vimb duckduckgo
-tabopen urxvt perls
-tabopen sup
-tabopen duckduckgo.com
-open censor password from dotfiles
-open what
-bmr
-bma
-tabopen vimb set not found
-set status-color-fg #de7788
-set status-color-fg=#de7788
-tabopen what
-open skozl.com
-open google.com
-open https://www.bbc.co.uk/news
-open color-bg
-open https://encrypted.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&ved=0CBwQFjAAahUKEwiZiIDrjpPHAhWFadsKHehuDUw&url=http%3A%2F%2Fthedarnedestthing.com%2Fvimb&ei=6p7CVZnrJ4XT7Qbo3bXgBA&usg=AFQjCNGPyfz-zTwK_JADioBSrpYsXSkOLw&bvm=bv.99261572,d.ZGU&cad=rja
-open skozl.com:8080
-open https://skozl.com:8080
-open enable hsts
-tabopen webkit 2
-open safari webkit version
-tabopen !arch webkit2
-open !aur vimb-git
-open linux browser test
-open firefox vs webkit
-open !w real madrid
-tabopen dito
-open ditto
-tabopen morgan freeman
-open dota picker
-tabopen organise dotfiles
-tabopen !gh holman/dotfiles
-open organise dotifiles
-open organise dotfiles
-tabopen header backup
-open !arch gervil
-tabopen fonts vs local/share/fonts
-open move all dotfiles to config
-open !gh vaskozl/dotfiles
-open github.com/vaskozl/dotfiles
-tabopen github organise folders
-open rpbar source
-open !gh rpbar
-tabopen screen tearing no compositor
-open !g tearfree intel arch
-tabopen barbecue in college
-tabopen sna acceleration
-open !arch tearfree
-open tearfree intel
-tabopen cut to number of characters
-tabopen ifs set
-open case regex
-open bash case wild card
-tabopen bash special characters
-tabopen bash case example
-open bash characters you have to escape
-open walking around naked
-open working out naked
-tabopen olivia munn nudes
-open google.com/ncr
-open faapy.com
-tabopen make a pussy
-tabopen pmatehunter.com
-tabopen faapy.com
-open pipe line by line
-open bash for each line in file
-open while read from pipe
-open ratpoison titlechanged
-tabopen ratpoison repo
-open ratpoison non-gun
-tabopen skozl.com
-open !arch printer
-tabopen pixma printer usb
-tabopen how to print with cups
-open !g cups bjnp how to print
-open !arch cups
-open !g m560 printer
-open !g arch printer mp560
-open !g linux print trough wireless printer
-tabopen localhost:731
-open 127.0.0.1:731
-open localhost:631
-open http://localhost:631
-tabopen !g arch linux wifi printer
-tabopen cups mp560 printer
-tabopen 192.168.0.1
-open 192.168.0.200
-tabopen 192.168.0.200
-tabopen arch print lpr printer
-open !g arch simple lpr print
-open android print with lpr printer
-open !g android print using lpr
-tabopen localhost:631
-open 127.0.0.1:631
-tabopen !p mp560 usb pdf
-tabopen pdf to png
-tabopen no photo data mp560 usb
-open !g mp560 usb no photo data format
-open !g mp560 easy print
-tabopen android how to print pdf
-open !g android how to print add printer]
-tabopen test
-open !g cyanogenmod print pdf
-open youtube.com
-open convert pdf to png high quality
-open !g android pdf read with print
-tabopen cyanogenmod pdf veiewer
-tabopen convert pdf to png imagemagick high quality
-open cool things to print
-open best printable foldable plane
-open use ssh for push
-open test
-open why
-open what is this
-open !g sh how to newline echo
-tabopen git remove sensitive file
-open revert last commit
-open git remove  sensitive file
-open git untrack file
diff --git a/config/vimb/config b/config/vimb/config
index dd8a6ca..1075b1e 100644
--- a/config/vimb/config
+++ b/config/vimb/config
@@ -1,10 +1,10 @@
 nmap s 10j
 nmap e 10k
-set status-color-bg=#131020
-set status-color-fg=#abc8c0
-set status-ssl-color-bg=#131020
-set status-ssl-color-fg=#abc8c0
-set completion-bg-active=#131020
-set completion-bg-normal=#131020
-set completion-fg-active=#7280a0
-set completion-fg-normal=#abc8c0
+set status-color-bg=#200c0c
+set status-color-fg=#c8834f
+set status-ssl-color-bg=#200c0c
+set status-ssl-color-fg=#c8834f
+set completion-bg-active=#200c0c
+set completion-bg-normal=#200c0c
+set completion-fg-active=#a0614d
+set completion-fg-normal=#c8834f
diff --git a/tools/panel/panel b/tools/panel/panel
index 69eb2f2..4260578 100755
--- a/tools/panel/panel
+++ b/tools/panel/panel
@@ -7,8 +7,8 @@ source ~/.colors
 mkfifo -m 777 "$PANEL_FIFO"
 
 
-bspc config top_padding $PANEL_HEIGHT
-bspc control --subscribe > "$PANEL_FIFO" &
+#bspc config top_padding $PANEL_HEIGHT
+#bspc control --subscribe > "$PANEL_FIFO" &
 ./windows > "$PANEL_FIFO" &
 echo "D`rpws current`" > "$PANEL_FIFO" &
 volume -f 'V%i' > "$PANEL_FIFO" &
@@ -23,7 +23,7 @@ unbuffer alsactl monitor | grep --line-buffered 'Headphone Jack' | while read li
 
 source ./panel_colors
 
-cat "$PANEL_FIFO" | ./panel_bar | lemonbar -f "$FONT_FONT" -f "$ICON_FONT" -g x$PANEL_HEIGHT -F "$COLOR11" -B "$COLOR0" &
+cat "$PANEL_FIFO" | ./panel_bar | lemonbar -f "$FONT_FONT" -f "$ICON_FONT" -g x$PANEL_HEIGHT -F "$COLOR11" -B "$COLOR0" -u 3 &
 
 #sleep 1;
 #stalonetray --geometry 1x1-415+2 --icon-gravity E --grow-gravity E  -bg $COLOR0 -i 20 &
diff --git a/tools/panel/panel_bar b/tools/panel/panel_bar
index ab39edf..4bc63f9 100755
--- a/tools/panel/panel_bar
+++ b/tools/panel/panel_bar
@@ -117,20 +117,19 @@ while read -r line ; do
 			desktop="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?}%{B-}%{F-}  "
           		;;
 		Wclear)
-			# focused occupied desktop
-			wm_infos=""
+			wm_infos=''
 			;;
 	
 		\**)
-			# focused occupied desktop
-			wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOCUSED_UG} ${line#?} %{-u}%{B-}%{F-}"
+			# current focused window
+			wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FG}%{B$COLOR_FOCUSED_BG}%{U$COLOR_FOCUSED_UG}%{+o} ${line#?} %{-o}%{B-}%{F-}%{U-}"
 			;;
 		+*)
-			# occupied desktop
+			# last focused window
 			wm_infos="${wm_infos}%{F$COLOR_OTHER_FG}%{B$COLOR_OTHER_BG} ${line#?} %{B-}%{F-}"
 			;;
         	-*)
-			# free desktop
+			# other windows
 			wm_infos="${wm_infos}%{F$COLOR_ELSE_FG}%{B$COLOR_ELSE_BG} ${line#?} %{B-}%{F-}"
 			;;
 #					u*)
@@ -143,5 +142,5 @@ while read -r line ; do
 #						;;
 	esac
 #	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos}             "
-	printf "%s\n" "%{l}${desktop}${wm_infos}${title}%{r}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}"
+	printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}"
 done
diff --git a/tools/ratpoisonrc.conf b/tools/ratpoisonrc.conf
index a40ce54..f441830 100644
--- a/tools/ratpoisonrc.conf
+++ b/tools/ratpoisonrc.conf
@@ -20,8 +20,8 @@ bind Tab nextscreen
 #have windows centered
 set wingravity center
 
-# Use the name of the program rather than the title in the window list
-set winname class
+# Set name to be title
+set winname title
 
 #Pest control.
 banish
@@ -61,7 +61,7 @@ unmanage stalonetray
 
 # hooks
 addhook switchwin barsend
-addhook deletewindow barsend
+#addhook deletewindow barsend
 addhook switchframe barsend
 addhook switchgroup barsend
 #addhook titlechanged barsend
@@ -86,7 +86,7 @@ definekey top F3 exec rpws 3 && echo "D3" > /tmp/panel-fifo #&& ratpoison -c bor
 definekey top F4 exec rpws 4 && echo "D4" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F5 exec rpws 5 && echo "D5" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F6 exec rpws 6 && echo "D6" > /tmp/panel-fifo #&& ratpoison -c bordscript
-definekey top F7 exec rpws 7 && echo "D8" > /tmp/panel-fifo #&& ratpoison -c bordscript
+definekey top F7 exec rpws 7 && echo "D7" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F8 exec rpws 8 && echo "D8" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F9 exec rpws 9 && printf "D9\nIxlear\n" > /tmp/panel-fifo #&& ratpoison -c bordscript
 definekey top F10 exec rpws 10 && printf "D10\nIclear\n" > /tmp/panel-fifo & xset -led named "Scroll Lock" #&& ratpoison -c bordscript
@@ -155,7 +155,8 @@ bind K exchangeup
 
 bind w window_menu
 bind a exec ratpoison -i -c 'title' && ratpoison -c 'barsend'                                                                                                                              
-bind t time
+bind t exec ~/bin/passenter
+bind T exec ~/bin/passmake
 definekey top s-l exec i3lock -n -i ~/.wallpaper.png
 definekey top s-s exec ~/bin/sus
 definekey top s-L redisplay
@@ -176,9 +177,8 @@ bind Escape abort
 bind m exec xfce4-popup-applicationsmenu
 
 #Paste goodness
-bind g exec ~/bin/imgur
-bind P exec xclip -o | curl -F 'sprunge=<-' http://sprunge.us | xclip 
- 
+bind g exec ~/bin/safeimg
+bind P exec ~/bin/safepaste
 
 alias bordtoggle exec ~/.tools/bordtoggle
 alias bordscript exec ~/.tools/borderscript
@@ -200,7 +200,7 @@ alias browse colon browse_cmd
 bind b browse
 # B : open a new firefox tab and browse to the X clipboard selection
 alias browse_selection exec .tools/exec_to_workspace 2 vimb `ratpoison -c getsel`
-bind B browse_selection
+bind B banish
 
 # Paste with X selection
 alias insert_X_selection meta S-Insert
@@ -213,7 +213,6 @@ bind i insert_X_selection
 
 definekey top s-f exec firefox
 definekey top s-u exec uzbl-browser
-definekey top s-m exec /home/vasko/.tools/pentfocus
 definekey top s-v exec vimb
 definekey top s-g exec gvim
 #definekey top s-l exec libreoffice