summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Jay Lanagan2024-04-23 20:17:10 +0200
committer Willy Sudiarto Raharjo2024-04-27 04:28:31 +0200
commit94a89d37b2763fa3dc209c0966e7fe87c4fdb380 (patch)
treed1ee7c54fdb15b4356022a4561447731707a4477
parent7866224eac2d868c2710913a78e05d40511524da (diff)
downloadslackbuilds-94a89d37b2763fa3dc209c0966e7fe87c4fdb380.tar.gz
desktop/nwg-shell: Updated for version 0.5.34.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--desktop/nwg-shell/nwg-shell.SlackBuild4
-rw-r--r--desktop/nwg-shell/nwg-shell.info6
-rw-r--r--desktop/nwg-shell/slackware.diff (renamed from desktop/nwg-shell/defaults.patch)174
3 files changed, 92 insertions, 92 deletions
diff --git a/desktop/nwg-shell/nwg-shell.SlackBuild b/desktop/nwg-shell/nwg-shell.SlackBuild
index ed565334b8..4d06bc8821 100644
--- a/desktop/nwg-shell/nwg-shell.SlackBuild
+++ b/desktop/nwg-shell/nwg-shell.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=nwg-shell
-VERSION=${VERSION:-0.5.33}
+VERSION=${VERSION:-0.5.34}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -78,7 +78,7 @@ cd $PRGNAM-$VERSION
chown -R root:root .
# patches removing refs to systemctl & replaced w/ loginctl & disable updater
-patch -Np1 -i $CWD/defaults.patch || exit 1
+patch -Np1 -i $CWD/slackware.diff || exit 1
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/desktop/nwg-shell/nwg-shell.info b/desktop/nwg-shell/nwg-shell.info
index aa1eea1783..bf256e983b 100644
--- a/desktop/nwg-shell/nwg-shell.info
+++ b/desktop/nwg-shell/nwg-shell.info
@@ -1,8 +1,8 @@
PRGNAM="nwg-shell"
-VERSION="0.5.33"
+VERSION="0.5.34"
HOMEPAGE="https://nwg-piotr.github.io/nwg-shell/"
-DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.33/nwg-shell-v0.5.33.tar.gz"
-MD5SUM="031b04c24624f97aca27e673f8a88822"
+DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.34/nwg-shell-v0.5.34.tar.gz"
+MD5SUM="3cfa51cb7d68c5d93a58c69a738e9857"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="foot grim jq brightnessctl papirus-icon-theme slurp gtklock-playerctl-module gtklock-powerbar-module gtklock-userinfo-module swappy sway swayidle swaylock wl-clipboard azote gopsuinfo nwg-bar nwg-clipman nwg-dock nwg-menu nwg-look nwg-panel nwg-readme-browser nwg-shell-config nwg-shell-wallpapers nwg-wrapper nwg-displays python3-autotiling xdg-desktop-portal-wlr"
diff --git a/desktop/nwg-shell/defaults.patch b/desktop/nwg-shell/slackware.diff
index 0a12f7aee7..e5bdf83ece 100644
--- a/desktop/nwg-shell/defaults.patch
+++ b/desktop/nwg-shell/slackware.diff
@@ -1,6 +1,6 @@
diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py
---- a/nwg_shell/installer.py 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/installer.py 2024-02-07 21:45:22.562125401 -0500
+--- a/nwg_shell/installer.py 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/installer.py 2024-04-23 08:06:15.320307748 -0400
@@ -173,7 +173,7 @@
print(" This script installs/overwrites configs and style sheets ")
print(" for sway, Hyprland and nwg-shell components. ")
@@ -15,7 +15,7 @@ diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py
if "editor" not in s or not s["editor"]:
- for cmd in ["mousepad", "atom", "emacs", "gedit", "geany", "kate", "vim"]:
-+ for cmd in ["mousepad", "emacs", "joe", "kate", "vim"]:
++ for cmd in ["mousepad", "atom", "emacs", "gedit", "joe", "kate", "vim"]:
if is_command(cmd):
s["editor"] = cmd
break
@@ -31,8 +31,8 @@ diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py
subprocess.call("sudo reboot", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
diff -ur a/nwg_shell/main.py b/nwg_shell/main.py
---- a/nwg_shell/main.py 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/main.py 2024-02-07 21:45:22.562125401 -0500
+--- a/nwg_shell/main.py 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/main.py 2024-04-23 08:06:35.004983477 -0400
@@ -10,7 +10,6 @@
print(" nwg-shell-installer -a [-hypr] installs All configs from scratch; [-hypr] includes Hyprland configs")
print(" nwg-shell-installer -w [-hypr] installs configs from scratch w/ no dialogs; [-hypr] includes Hyprland configs")
@@ -42,8 +42,8 @@ diff -ur a/nwg_shell/main.py b/nwg_shell/main.py
diff -ur a/nwg_shell/skel/config/foot/foot.ini b/nwg_shell/skel/config/foot/foot.ini
---- a/nwg_shell/skel/config/foot/foot.ini 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/foot/foot.ini 2024-02-07 21:45:22.562125401 -0500
+--- a/nwg_shell/skel/config/foot/foot.ini 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/foot/foot.ini 2024-04-23 08:06:57.188618092 -0400
@@ -2,7 +2,7 @@
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
@@ -54,8 +54,8 @@ diff -ur a/nwg_shell/skel/config/foot/foot.ini b/nwg_shell/skel/config/foot/foot
# app-id=foot
# title=foot
diff -ur a/nwg_shell/skel/config/hypr/hyprland.conf b/nwg_shell/skel/config/hypr/hyprland.conf
---- a/nwg_shell/skel/config/hypr/hyprland.conf 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/hypr/hyprland.conf 2024-02-07 21:45:22.562125401 -0500
+--- a/nwg_shell/skel/config/hypr/hyprland.conf 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/hypr/hyprland.conf 2024-04-23 08:07:58.307611735 -0400
@@ -17,8 +17,7 @@
#
exec = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
@@ -67,8 +67,8 @@ diff -ur a/nwg_shell/skel/config/hypr/hyprland.conf b/nwg_shell/skel/config/hypr
#
# Include settings generated by nwg-shell-config
diff -ur a/nwg_shell/skel/config/nwg-bar/bar.json b/nwg_shell/skel/config/nwg-bar/bar.json
---- a/nwg_shell/skel/config/nwg-bar/bar.json 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-bar/bar.json 2024-02-07 21:45:22.563125383 -0500
+--- a/nwg_shell/skel/config/nwg-bar/bar.json 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-bar/bar.json 2024-04-23 08:13:11.595459991 -0400
@@ -11,12 +11,12 @@
},
{
@@ -86,8 +86,8 @@ diff -ur a/nwg_shell/skel/config/nwg-bar/bar.json b/nwg_shell/skel/config/nwg-ba
]
\ No newline at end of file
diff -ur a/nwg_shell/skel/config/nwg-bar/hyprland.json b/nwg_shell/skel/config/nwg-bar/hyprland.json
---- a/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-02-07 21:45:22.563125383 -0500
+--- a/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-bar/hyprland.json 2024-04-23 08:13:32.787113097 -0400
@@ -11,12 +11,12 @@
},
{
@@ -105,53 +105,53 @@ diff -ur a/nwg_shell/skel/config/nwg-bar/hyprland.json b/nwg_shell/skel/config/n
]
\ No newline at end of file
diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-0 b/nwg_shell/skel/config/nwg-panel/hyprland-0
---- a/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-0 2024-04-23 08:14:52.432809425 -0400
@@ -84,11 +84,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-1 b/nwg_shell/skel/config/nwg-panel/hyprland-1
---- a/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-1 2024-04-23 08:14:58.944702840 -0400
@@ -86,11 +86,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-2 b/nwg_shell/skel/config/nwg-panel/hyprland-2
---- a/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-2 2024-04-23 08:15:06.752575048 -0400
@@ -83,11 +83,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
@@ -167,70 +167,70 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-2 b/nwg_shell/skel/config/nw
"file-manager": "thunar",
"height": 0,
diff -ur a/nwg_shell/skel/config/nwg-panel/hyprland-3 b/nwg_shell/skel/config/nwg-panel/hyprland-3
---- a/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/hyprland-3 2024-04-23 08:15:15.176437171 -0400
@@ -82,11 +82,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
diff -ur a/nwg_shell/skel/config/nwg-panel/preset-0 b/nwg_shell/skel/config/nwg-panel/preset-0
---- a/nwg_shell/skel/config/nwg-panel/preset-0 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/preset-0 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/preset-0 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/preset-0 2024-04-23 08:15:23.410302403 -0400
@@ -85,11 +85,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
diff -ur a/nwg_shell/skel/config/nwg-panel/preset-1 b/nwg_shell/skel/config/nwg-panel/preset-1
---- a/nwg_shell/skel/config/nwg-panel/preset-1 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/preset-1 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/preset-1 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/preset-1 2024-04-23 08:15:31.000178183 -0400
@@ -87,11 +87,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
diff -ur a/nwg_shell/skel/config/nwg-panel/preset-2 b/nwg_shell/skel/config/nwg-panel/preset-2
---- a/nwg_shell/skel/config/nwg-panel/preset-2 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/preset-2 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/preset-2 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/preset-2 2024-04-23 08:15:38.024063224 -0400
@@ -99,11 +99,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
@@ -246,25 +246,25 @@ diff -ur a/nwg_shell/skel/config/nwg-panel/preset-2 b/nwg_shell/skel/config/nwg-
"file-manager": "thunar",
"height": 0,
diff -ur a/nwg_shell/skel/config/nwg-panel/preset-3 b/nwg_shell/skel/config/nwg-panel/preset-3
---- a/nwg_shell/skel/config/nwg-panel/preset-3 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/nwg-panel/preset-3 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/nwg-panel/preset-3 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/nwg-panel/preset-3 2024-04-23 08:15:45.775936353 -0400
@@ -83,11 +83,11 @@
},
{
"name": "Restart",
-- "cmd": "systemctl reboot"
-+ "cmd": "loginctl reboot"
+- "cmd": "nwg-dialog -p reboot -c \"systemctl reboot\""
++ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
-- "cmd": "systemctl -i poweroff"
-+ "cmd": "loginctl -i poweroff"
+- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
++ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
diff -ur a/nwg_shell/skel/config/sway/autostart b/nwg_shell/skel/config/sway/autostart
---- a/nwg_shell/skel/config/sway/autostart 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/sway/autostart 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/sway/autostart 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/sway/autostart 2024-04-23 08:16:45.765954548 -0400
@@ -6,8 +6,6 @@
exec_always nwg-autotiling
exec_always nwg-drawer -r -s preset-0.css -term foot -ft
@@ -275,8 +275,8 @@ diff -ur a/nwg_shell/skel/config/sway/autostart b/nwg_shell/skel/config/sway/aut
exec_always nwg-screenshot-applet
exec_always nwg-shell-config -s
diff -ur a/nwg_shell/skel/config/sway/config b/nwg_shell/skel/config/sway/config
---- a/nwg_shell/skel/config/sway/config 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/config/sway/config 2024-02-07 21:45:22.564125365 -0500
+--- a/nwg_shell/skel/config/sway/config 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/config/sway/config 2024-04-23 08:18:36.244146606 -0400
@@ -36,10 +36,9 @@
############### Autostart ##################
@@ -291,18 +291,18 @@ diff -ur a/nwg_shell/skel/config/sway/config b/nwg_shell/skel/config/sway/config
### Turn off screen on lid closed
diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/nwg-shell-config/settings
---- a/nwg_shell/skel/data/nwg-shell-config/settings 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/data/nwg-shell-config/settings 2024-02-07 21:45:22.565125347 -0500
+--- a/nwg_shell/skel/data/nwg-shell-config/settings 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/data/nwg-shell-config/settings 2024-04-23 08:20:04.961694894 -0400
@@ -18,9 +18,9 @@
"browser": "",
- "pb-exit": "swaymsg exit",
+ "pb-exit": "nwg-dialog -p exit-sway -c \"swaymsg exit\"",
"pb-lock": "nwg-lock",
-- "pb-poweroff": "systemctl -i poweroff",
-- "pb-reboot": "systemctl reboot",
-- "pb-sleep": "systemctl suspend",
-+ "pb-poweroff": "loginctl poweroff",
-+ "pb-reboot": "loginctl reboot",
-+ "pb-sleep": "loginctl suspend",
+- "pb-poweroff": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"",
+- "pb-reboot": "nwg-dialog -p reboot -c \"systemctl reboot\"",
+- "pb-sleep": "nwg-dialog -p sleep -c \"systemctl suspend\"",
++ "pb-poweroff": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"",
++ "pb-reboot": "nwg-dialog -p reboot -c \"loginctl reboot\"",
++ "pb-sleep": "nwg-dialog -p sleep -c \"loginctl suspend\"",
"panel-preset": "preset-0",
"panel-custom": "",
"show-on-startup": false,
@@ -313,7 +313,7 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/n
- "gtklock-poweroff-command": "systemctl -i poweroff",
- "gtklock-reboot-command": "systemctl reboot",
- "gtklock-suspend-command": "systemctl suspend",
-+ "gtklock-poweroff-command": "loginctl poweroff",
++ "gtklock-poweroff-command": "loginctl -i poweroff",
+ "gtklock-reboot-command": "loginctl reboot",
+ "gtklock-suspend-command": "loginctl suspend",
"gtklock-time-format": "%H:%M:%S",
@@ -326,22 +326,22 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings b/nwg_shell/skel/data/n
}
\ No newline at end of file
diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland
---- a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-02-04 20:54:31.000000000 -0500
-+++ b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-02-07 21:45:22.565125347 -0500
+--- a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-04-18 20:06:36.000000000 -0400
++++ b/nwg_shell/skel/data/nwg-shell-config/settings-hyprland 2024-04-23 08:20:16.632503931 -0400
@@ -16,9 +16,9 @@
"show-on-startup": false,
- "pb-exit": "hyprctl dispatch exit",
+ "pb-exit": "nwg-dialog -p exit-hyprland -c \"hyprctl dispatch exit\"",
"pb-lock": "nwg-lock",
-- "pb-poweroff": "systemctl -i poweroff",
-- "pb-reboot": "systemctl reboot",
-- "pb-sleep": "systemctl suspend",
-+ "pb-poweroff": "loginctl poweroff",
-+ "pb-reboot": "loginctl reboot",
-+ "pb-sleep": "loginctl suspend",
+- "pb-poweroff": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\"",
+- "pb-reboot": "nwg-dialog -p reboot -c \"systemctl reboot\"",
+- "pb-sleep": "nwg-dialog -p sleep -c \"systemctl suspend\"",
++ "pb-poweroff": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\"",
++ "pb-reboot": "nwg-dialog -p reboot -c \"loginctl reboot\"",
++ "pb-sleep": "nwg-dialog -p sleep -c \"loginctl suspend\"",
"gen-use-settings": true,
"gen-border_size": 1,
"gen-no_border_on_floating": false,
-@@ -103,7 +103,7 @@
+@@ -104,7 +104,7 @@
"lockscreen-custom-cmd": "",
"lockscreen-timeout": 1200,
"screenshot": true,
@@ -350,14 +350,14 @@ diff -ur a/nwg_shell/skel/data/nwg-shell-config/settings-hyprland b/nwg_shell/sk
"sleep-timeout": 1800,
"resume-cmd": "",
"before-sleep": "",
-@@ -128,13 +128,13 @@
+@@ -129,13 +129,13 @@
"gtklock-logout-command": "swaymsg exit",
"gtklock-playerctl": false,
"gtklock-powerbar": false,
- "gtklock-poweroff-command": "systemctl -i poweroff",
- "gtklock-reboot-command": "systemctl reboot",
- "gtklock-suspend-command": "systemctl suspend",
-+ "gtklock-poweroff-command": "loginctl poweroff",
++ "gtklock-poweroff-command": "loginctl -i poweroff",
+ "gtklock-reboot-command": "loginctl reboot",
+ "gtklock-suspend-command": "loginctl suspend",
"gtklock-time-format": "%H:%M:%S",