From 7054737fbe00234827dbeeab86bc31acf909d414 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Thu, 5 Mar 2015 21:55:33 +0100 Subject: fix year --- config/sxhkd/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 9e0bc58..4d122d2 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -134,7 +134,7 @@ super + s skype super + shift + L - i3lock -n -i ~/.wallpaper.png -z + ~/.ratpoison/lock # -- cgit v1.2.3-54-g00ecf From 02dbe85011616cc97332c7e56e39a8989c45de08 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 15 Mar 2015 00:54:36 +0100 Subject: efficiency + battery --- bash_aliases | 2 +- config/sxhkd/sxhkdrc | 10 +++++----- ratpoison/panel/music | 31 ++----------------------------- ratpoison/panel/panel | 12 ++++++------ ratpoison/panel/panel_bar | 44 +++++++++++++++++++++----------------------- rtorrent.rc | 6 +++--- vimperatorrc | 2 +- xinitrc | 10 +++++----- 8 files changed, 44 insertions(+), 73 deletions(-) (limited to 'config') diff --git a/bash_aliases b/bash_aliases index 694b141..0455579 100644 --- a/bash_aliases +++ b/bash_aliases @@ -121,7 +121,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 4d122d2..ea6a681 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -182,19 +182,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/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 5d54198..acff0ba 100644 --- a/vimperatorrc +++ b/vimperatorrc @@ -56,4 +56,4 @@ set gui=nonavigation source! /home/vasko/.vimperatorrc.local " vim: set ft=vimperator: -set defsearch=duckduckgo +set defsearch=crypted diff --git a/xinitrc b/xinitrc index b8bbf3f..3ad6809 100755 --- a/xinitrc +++ b/xinitrc @@ -48,7 +48,7 @@ xset m 0 0 xset -b # Launch locking program -xautolock -detectsleep -locker '~/.ratpoison/lock' -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) -- cgit v1.2.3-54-g00ecf