From 15d09bac36f1a5845c87d6c5f4edb64634407546 Mon Sep 17 00:00:00 2001 From: Hekuran Date: Thu, 23 Sep 2021 20:54:58 +0200 Subject: [PATCH] sysact rewrite and minor stuff (#1000) * minor forgoten stuff we already have shutdown in sudo loop * why was this still here? it belongs in ~/.config/ * what the actual phucc * implemented loginctl and fixed shebang --- {pinentry => .config/pinentry}/preexec | 0 .config/shell/aliasrc | 2 +- .local/bin/sysact | 30 +++++++++++--------------- 3 files changed, 14 insertions(+), 18 deletions(-) rename {pinentry => .config/pinentry}/preexec (100%) diff --git a/pinentry/preexec b/.config/pinentry/preexec similarity index 100% rename from pinentry/preexec rename to .config/pinentry/preexec diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 0890ccd..ad71695 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -35,7 +35,7 @@ alias \ g="git" \ trem="transmission-remote" \ YT="youtube-viewer" \ - sdn="sudo shutdown -h now" \ + sdn="shutdown -h now" \ e="$EDITOR" \ v="$EDITOR" \ p="pacman" \ diff --git a/.local/bin/sysact b/.local/bin/sysact index a820158..451815d 100755 --- a/.local/bin/sysact +++ b/.local/bin/sysact @@ -1,22 +1,18 @@ #!/bin/sh - # A dmenu wrapper script for system functions. - -# For non-systemd init systems. case "$(readlink -f /sbin/init)" in - *runit*) hib="sudo -A zzz" ;; - *openrc*) reb="sudo -A openrc-shutdown -r"; shut="sudo -A openrc-shutdown -p 0" ;; + *systemd*) ctl='systemctl' ;; + *) ctl='loginctl' ;; esac -cmds="\ -🔒 lock slock -🚪 leave dwm kill -TERM $(pgrep -u $USER "\bdwm$") -♻ renew dwm kill -HUP $(pgrep -u $USER "\bdwm$") -🐻 hibernate slock ${hib:-systemctl suspend-then-hibernate -i} -🔃 reboot ${reb:-sudo -A reboot} -🖥 shutdown ${shut:-sudo -A shutdown -h now} -📺 display off xset dpms force off" - -choice="$(echo "$cmds" | cut -d' ' -f 1 | dmenu)" || exit 1 - -eval "$(echo "$cmds" | grep "^$choice " | cut -d ' ' -f2-)" +case "$(printf "🔒 lock\n🚪 leave dwm\n♻️ renew dwm\n🐻 hibernate\n💤 sleep\n🔃 reboot\n🖥️shutdown\n📺 display off" | dmenu -i -p 'Action: ')" in + '🔒 lock') slock ;; + '🚪 leave dwm') kill -TERM "$(pgrep -u "$USER" "\bdwm$")" ;; + '♻️ renew dwm') kill -HUP "$(pgrep -u "$USER" "\bdwm$")" ;; + '🐻 hibernate') slock $ctl hibernate ;; + '💤 sleep') slock $ctl suspend ;; + '🔃 reboot') $ctl reboot ;; + '🖥️shutdown') $ctl poweroff ;; + '📺 display off') xset dpms force off ;; + *) exit 1 ;; +esac