From 648365197b36e8abf98c856533cd5e88143df15b Mon Sep 17 00:00:00 2001 From: Tslil Clingman Date: Thu, 9 Jul 2015 21:49:41 +0200 Subject: Allowed for headphone adjustments in vol Also turned off monitor after screen lock --- lock | 1 + sc | 14 +++++++------- vol | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/lock b/lock index 8941335..6cf218d 100755 --- a/lock +++ b/lock @@ -1,3 +1,4 @@ #!/usr/bin/env sh killall -s HUP gpg-agent +xset dpms force off slock diff --git a/sc b/sc index 10083f4..154c620 100755 --- a/sc +++ b/sc @@ -1,13 +1,13 @@ #!/usr/bin/env sh # Quick hack to manage screen hotplugging case "$1" in - "d") xrandr --nograb --output VGA-0 --off --output LVDS --auto;; - "r") xrandr --nograb --output VGA-0 --auto --primary --output LVDS --off;; - "c") xrandr --nograb --output VGA-0 --auto --output LVDS --auto;; - "n") xrandr --nograb --output LVDS --auto --above VGA-0 --output VGA-0 --auto;; - "s") xrandr --nograb --output LVDS --auto --below VGA-0 --output VGA-0 --auto;; - "e") xrandr --nograb --output LVDS --auto --right-of VGA-0 --output VGA-0 --auto;; - "w") xrandr --nograb --output LVDS --auto --left-of VGA-0 --output VGA-0 --auto;; + "d") xrandr --nograb --output VGA1 --off --output LVDS1 --auto;; + "r") xrandr --nograb --output VGA1 --auto --primary --output LVDS1 --off;; + "c") xrandr --nograb --output VGA1 --auto --output LVDS1 --auto;; + "n") xrandr --nograb --output LVDS1 --auto --above VGA1 --output VGA1 --auto;; + "s") xrandr --nograb --output LVDS1 --auto --below VGA1 --output VGA1 --auto;; + "e") xrandr --nograb --output LVDS1 --auto --right-of VGA1 --output VGA1 --auto;; + "w") xrandr --nograb --output LVDS1 --auto --left-of VGA1 --output VGA1 --auto;; *) xrandr --nograb ;; esac; #feh --bg-center "$BKG" diff --git a/vol b/vol index 778abf9..662b92e 100755 --- a/vol +++ b/vol @@ -2,13 +2,22 @@ # A small volume control script for the laptop -cmd="amixer set Master" +if [ "$1" == "--headphone" ]; then + shift; + mixer="Headphone" +else + mixer="Master" +fi; + +cmd="amixer set $mixer" fle=$HOME/.vol + +echo -n $mixer\ > $fle case "$1" in - "up") $cmd 2%+;; - "down") $cmd 2%-;; + "--up") $cmd 2%+;; + "--down") $cmd 2%-;; *) $cmd toggle;; -esac | grep \% | cut -d\ -f 6,8 | tr -d '[]' > $fle +esac | tail -n 1 | cut -d: -f 2 | cut -d\ -f 4,6 | tr -d '[]' >> $fle for c in "set bargravity ne" "echo Volume: `cat $fle`" "set bargravity c"; do ratpoison -c "$c" -- cgit v1.2.3