aboutsummaryrefslogtreecommitdiff
path: root/dotfiles/.local
diff options
context:
space:
mode:
authorYaroslav <contact@yaroslavps.com>2020-09-10 13:52:44 +0300
committerYaroslav <contact@yaroslavps.com>2020-09-10 13:52:44 +0300
commit647bd4dc91bb627eb3298eb5ccb3fe5a164103eb (patch)
treeb7804f4e467974b3dca219ee59715bc9fb3af70f /dotfiles/.local
parent8f413b0058756e852d3012b9ca02b073fe867cff (diff)
parente5a7e88b25b88f9aa55bbce105467c81472a6aba (diff)
downloadswayrice-647bd4dc91bb627eb3298eb5ccb3fe5a164103eb.tar.gz
swayrice-647bd4dc91bb627eb3298eb5ccb3fe5a164103eb.zip
Merge branch 'master' of github.com:Yaroslav-95/swayrice into master
Diffstat (limited to 'dotfiles/.local')
-rwxr-xr-xdotfiles/.local/bin/lock-color5
-rwxr-xr-xdotfiles/.local/bin/swayresize5
2 files changed, 9 insertions, 1 deletions
diff --git a/dotfiles/.local/bin/lock-color b/dotfiles/.local/bin/lock-color
index 0026842..2d30e0b 100755
--- a/dotfiles/.local/bin/lock-color
+++ b/dotfiles/.local/bin/lock-color
@@ -4,7 +4,10 @@ swaymsg input type:keyboard xkb_switch_layout 0
gpg-connect-agent --no-autostart reloadagent /bye
-swayidle timeout 30 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' &
+if [ "$1" != "screenon" ]; then
+ swayidle timeout 30 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' &
+fi
+
swaylock
pkill -n swayidle
diff --git a/dotfiles/.local/bin/swayresize b/dotfiles/.local/bin/swayresize
index 9ae94c0..89368e9 100755
--- a/dotfiles/.local/bin/swayresize
+++ b/dotfiles/.local/bin/swayresize
@@ -1,9 +1,14 @@
#!/bin/sh
# This script was made by `goferito` on Github.
# Some cleanup by Luke.
+# Some improvements by Yaroslav.
[ -z "$1" ] && echo "No direction provided" && exit 1
+
distanceStr="2 px or 2 ppt"
+if [ -n "$2" ]; then
+ distanceStr="$(printf "%s px or %s ppt" "$2" "$2")"
+fi
moveChoice() {
swaymsg resize "$1" "$2" "$distanceStr" | grep '"success":true' || \