1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
diff -ur a/nwg_shell/installer.py b/nwg_shell/installer.py
--- 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. ")
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", "atom", "emacs", "gedit", "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-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")
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-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)
# 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-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
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-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 @@
},
{
"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"
}
]
\ 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-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 @@
},
{
"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"
}
]
\ 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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
+ "cmd": "nwg-dialog -p poweroff -c \"loginctl -i poweroff\""
}
]
},
@@ -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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "cmd": "nwg-dialog -p poweroff -c \"systemctl -i poweroff\""
+ "cmd": "nwg-dialog -p poweroff -c \"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 -i poweroff",
"autohide": true,
"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-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": "nwg-dialog -p reboot -c \"systemctl reboot\""
+ "cmd": "nwg-dialog -p reboot -c \"loginctl reboot\""
},
{
"name": "Shutdown",
- "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-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
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-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 ##################
-exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec hash dbus-update-activation-environment 2>/dev/null && \
- dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+ dbus-update-activation-environment --all DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec /usr/libexec/polkit-gnome-authentication-agent-1
exec ~/.azotebg
### 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-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": "nwg-dialog -p exit-sway -c \"swaymsg exit\"",
"pb-lock": "nwg-lock",
- "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,
@@ -90,13 +90,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 -i 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 -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-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": "nwg-dialog -p exit-hyprland -c \"hyprctl dispatch exit\"",
"pb-lock": "nwg-lock",
- "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,
@@ -104,7 +104,7 @@
"lockscreen-custom-cmd": "",
"lockscreen-timeout": 1200,
"screenshot": true,
- "sleep-cmd": "systemctl suspend",
+ "sleep-cmd": "loginctl suspend",
"sleep-timeout": 1800,
"resume-cmd": "",
"before-sleep": "",
@@ -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 -i 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
|
