desktop/nwg-shell: Updated for version 0.5.32.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 279 insertions, 63 deletions

diff --git a/desktop/nwg-shell/defaults.patch b/desktop/nwg-shell/defaults.patch
index 7dd920fde4..0a12f7aee7 100644
--- a/desktop/nwg-shell/defaults.patch
+++ b/desktop/nwg-shell/defaults.patch
@@ -1,15 +1,74 @@
---- a/nwg_shell/skel/config/sway/autostart
-+++ b/nwg_shell/skel/config/sway/autostart
-@@ -4,6 +4,5 @@
- exec_always nwg-autotiling
- exec_always nwg-drawer -r -s preset-0.css -term foot
- exec_always nwg-panel -c preset-0 -s preset-0.css
--exec_always nwg-shell-check-updates
- exec nwg-look -a
- exec nwg-shell-config
-
---- a/nwg_shell/skel/config/nwg-bar/bar.json
-+++ b/nwg_shell/skel/config/nwg-bar/bar.json
+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
+@@ -173,7 +173,7 @@
+         print("    This script installs/overwrites configs and style sheets       ")
+         print("          for sway, Hyprland and nwg-shell components.             ")
+         print("  The only backup that will be made is the main sway config file.  ")
+-        print("   This script should be used on a fresh Arch Linux installation.  ")
++        print("   This script should be used on a fresh Slackware installation.   ")
+         print("            If you're running it on your existing setup,           ")
+         print("                 you're doing it at your own risk.                 ")
+         print("*******************************************************************")
+@@ -255,7 +255,7 @@
+                         break
+ 
+             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"]:
+                     if is_command(cmd):
+                         s["editor"] = cmd
+                         break
+@@ -307,8 +307,8 @@
+             else:
+                 print("Your computer will now restart...")
+                 time.sleep(3)
+-                if is_command("systemctl"):
+-                    subprocess.call("sudo systemctl reboot -f", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
++                if is_command("loginctl"):
++                    subprocess.call("sudo loginctl reboot", shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT)
+                 else:
+                     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
+@@ -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")
+     print("  nwg-shell-installer -r [-hypr] Restores missing configs, styles & data files; [-hypr] includes Hyprland configs")
+-    print("  nwg-shell-check-updates        system command to check updates; no point in using manually")
+     print('\nWiki: https://github.com/nwg-piotr/nwg-shell/wiki')
+ 
+ 
+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
+@@ -2,7 +2,7 @@
+ 
+ # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
+ # term=foot (or xterm-256color if built with -Dterminfo=disabled)
+-# login-shell=no
++login-shell=yes
+ 
+ # 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
+@@ -17,8 +17,7 @@
+ #
+ exec = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+ exec-once = ~/.azotebg-hyprland # Wallpaper
+-exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
++exec-once = dbus-update-activation-environment --all WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+ 
+ #
+ # 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
 @@ -11,12 +11,12 @@
    },
    {
@@ -21,14 +80,51 @@
    {
      "label": "Shutdown",
 -    "exec": "systemctl -i poweroff",
-+    "exec": "loginctl poweroff",
++    "exec": "loginctl -i poweroff",
+     "icon": "/usr/share/nwg-bar/images/system-shutdown.svg"
+   }
+ ]
+\ 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
+@@ -11,12 +11,12 @@
+   },
+   {
+     "label": "_Reboot",
+-    "exec": "systemctl reboot",
++    "exec": "loginctl reboot",
+     "icon": "/usr/share/nwg-bar/images/system-reboot.svg"
+   },
+   {
+     "label": "_Shutdown",
+-    "exec": "systemctl -i poweroff",
++    "exec": "loginctl -i poweroff",
      "icon": "/usr/share/nwg-bar/images/system-shutdown.svg"
    }
  ]
-
---- a/nwg_shell/skel/config/nwg-panel/preset-0
-+++ b/nwg_shell/skel/config/nwg-panel/preset-0
-@@ -81,11 +81,11 @@
+\ 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
+@@ -84,11 +84,11 @@
+           },
+           {
+             "name": "Restart",
+-            "cmd": "systemctl reboot"
++            "cmd": "loginctl reboot"
+           },
+           {
+             "name": "Shutdown",
+-            "cmd": "systemctl -i poweroff"
++            "cmd": "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
+@@ -86,11 +86,11 @@
            },
            {
              "name": "Restart",
@@ -38,13 +134,13 @@
            {
              "name": "Shutdown",
 -            "cmd": "systemctl -i poweroff"
-+            "cmd": "loginctl poweroff"
++            "cmd": "loginctl -i poweroff"
            }
          ]
        },
-
---- a/nwg_shell/skel/config/nwg-panel/preset-1
-+++ b/nwg_shell/skel/config/nwg-panel/preset-1
+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
 @@ -83,11 +83,11 @@
            },
            {
@@ -55,14 +151,25 @@
            {
              "name": "Shutdown",
 -            "cmd": "systemctl -i poweroff"
-+            "cmd": "loginctl poweroff"
++            "cmd": "loginctl -i poweroff"
            }
          ]
        },
-
---- a/nwg_shell/skel/config/nwg-panel/preset-2
-+++ b/nwg_shell/skel/config/nwg-panel/preset-2
-@@ -103,11 +103,11 @@
+@@ -142,8 +142,8 @@
+     "menu-start-settings": {
+       "cmd-lock": "swaylock -f -c 000000",
+       "cmd-logout": "swaymsg exit",
+-      "cmd-restart": "systemctl reboot",
+-      "cmd-shutdown": "systemctl -i poweroff",
++      "cmd-restart": "loginctl reboot",
++      "cmd-shutdown": "loginctl -i poweroff",
+       "autohide": true,
+       "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
+@@ -82,11 +82,11 @@
            },
            {
              "name": "Restart",
@@ -72,25 +179,76 @@
            {
              "name": "Shutdown",
 -            "cmd": "systemctl -i poweroff"
-+            "cmd": "loginctl poweroff"
++            "cmd": "loginctl -i poweroff"
            }
          ]
        },
-@@ -150,8 +150,8 @@
+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
+@@ -85,11 +85,11 @@
+           },
+           {
+             "name": "Restart",
+-            "cmd": "systemctl reboot"
++            "cmd": "loginctl reboot"
+           },
+           {
+             "name": "Shutdown",
+-            "cmd": "systemctl -i poweroff"
++            "cmd": "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
+@@ -87,11 +87,11 @@
+           },
+           {
+             "name": "Restart",
+-            "cmd": "systemctl reboot"
++            "cmd": "loginctl reboot"
+           },
+           {
+             "name": "Shutdown",
+-            "cmd": "systemctl -i poweroff"
++            "cmd": "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
+@@ -99,11 +99,11 @@
+           },
+           {
+             "name": "Restart",
+-            "cmd": "systemctl reboot"
++            "cmd": "loginctl reboot"
+           },
+           {
+             "name": "Shutdown",
+-            "cmd": "systemctl -i poweroff"
++            "cmd": "loginctl -i poweroff"
+           }
+         ]
+       },
+@@ -148,8 +148,8 @@
      "menu-start-settings": {
        "cmd-lock": "swaylock -f -c 000000",
        "cmd-logout": "swaymsg exit",
 -      "cmd-restart": "systemctl reboot",
 -      "cmd-shutdown": "systemctl -i poweroff",
 +      "cmd-restart": "loginctl reboot",
-+      "cmd-shutdown": "loginctl poweroff",
++      "cmd-shutdown": "loginctl -i poweroff",
        "autohide": true,
        "file-manager": "thunar",
        "height": 0,
-
---- a/nwg_shell/skel/config/nwg-panel/preset-3
-+++ b/nwg_shell/skel/config/nwg-panel/preset-3
-@@ -79,11 +79,11 @@
+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
+@@ -83,11 +83,11 @@
            },
            {
              "name": "Restart",
@@ -100,13 +258,25 @@
            {
              "name": "Shutdown",
 -            "cmd": "systemctl -i poweroff"
-+            "cmd": "loginctl poweroff"
++            "cmd": "loginctl -i poweroff"
            }
          ]
        },
-
---- a/nwg_shell/skel/config/sway/config
-+++ b/nwg_shell/skel/config/sway/config
+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
+@@ -6,8 +6,6 @@
+ exec_always nwg-autotiling
+ exec_always nwg-drawer -r -s preset-0.css -term foot -ft
+ exec_always nwg-panel -c preset-0 -s preset-0.css
+-exec_always nwg-shell-check-updates
+ exec nwg-look -a
+-exec nwg-update-indicator
+ 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
 @@ -36,10 +36,9 @@
  
  ###############     Autostart      ##################
@@ -120,10 +290,23 @@
  exec ~/.azotebg
  
  ### Turn off screen on lid closed
-
---- a/nwg_shell/skel/data/nwg-shell-config/settings
-+++ b/nwg_shell/skel/data/nwg-shell-config/settings
-@@ -83,9 +83,9 @@
+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
+@@ -18,9 +18,9 @@
+   "browser": "",
+   "pb-exit": "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",
+   "panel-preset": "preset-0",
+   "panel-custom": "",
+   "show-on-startup": false,
+@@ -90,13 +90,13 @@
    "gtklock-logout-command": "swaymsg exit",
    "gtklock-playerctl": false,
    "gtklock-powerbar": false,
@@ -135,21 +318,54 @@
 +  "gtklock-suspend-command": "loginctl suspend",
    "gtklock-time-format": "%H:%M:%S",
    "gtklock-userinfo": false,
-   "gtklock-userswitch-command": ""
-
---- a/nwg_shell/skel/config/hypr/hyprland.conf
-+++ b/nwg_shell/skel/config/hypr/hyprland.conf
-@@ -15,10 +15,9 @@
- # Autostart. Feel free to add your own entries.
- # Shell components will be started in the includes.conf file, which we include below.
- #
--exec = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-+exec = /usr/libexec/polkit-gnome-authentication-agent-1
- exec-once = ~/.azotebg-hyprland # Wallpaper
--exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
--exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-+exec-once = dbus-update-activation-environment --all WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
- 
- #
- # Include settings generated by nwg-shell-config
-
+   "gtklock-userswitch-command": "",
+   "update-indicator-on": true,
+   "update-indicator-interval": 30,
+-  "update-command": "nwg-system-update"
++  "update-command": ""
+ }
+\ 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
+@@ -16,9 +16,9 @@
+   "show-on-startup": false,
+   "pb-exit": "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",
+   "gen-use-settings": true,
+   "gen-border_size": 1,
+   "gen-no_border_on_floating": false,
+@@ -103,7 +103,7 @@
+   "lockscreen-custom-cmd": "",
+   "lockscreen-timeout": 1200,
+   "screenshot": true,
+-  "sleep-cmd": "systemctl suspend",
++  "sleep-cmd": "loginctl suspend",
+   "sleep-timeout": 1800,
+   "resume-cmd": "",
+   "before-sleep": "",
+@@ -128,13 +128,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-reboot-command": "loginctl reboot",
++  "gtklock-suspend-command": "loginctl suspend",
+   "gtklock-time-format": "%H:%M:%S",
+   "gtklock-userinfo": false,
+   "gtklock-userswitch-command": "",
+   "update-indicator-on": true,
+   "update-indicator-interval": 30,
+-  "update-command": "nwg-system-update"
++  "update-command": ""
+ }
+\ No newline at end of file
diff --git a/desktop/nwg-shell/nwg-shell.SlackBuild b/desktop/nwg-shell/nwg-shell.SlackBuild
index 766ea471e5..ef95ec195d 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.31}
+VERSION=${VERSION:-0.5.32}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/desktop/nwg-shell/nwg-shell.info b/desktop/nwg-shell/nwg-shell.info
index 6116915102..1b22568d4d 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.31"
+VERSION="0.5.32"
 HOMEPAGE="https://nwg-piotr.github.io/nwg-shell/"
-DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.31/nwg-shell-v0.5.31.tar.gz"
-MD5SUM="130d2e6a276c4ecb4d6440ada5b412e8"
+DOWNLOAD="https://github.com/nwg-piotr/nwg-shell/releases/download/v0.5.32/nwg-shell-v0.5.32.tar.gz"
+MD5SUM="9a6eb16e6c0b765cfdf595450e640e84"
 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"