Added gnome as a profile (and application for application specific steps). Also tweaked xorg to not be so intrusive when used for anything other than awesome WM. Tweaked awesome WM to accomodate this change.

2 files changed, 6 insertions, 10 deletions

diff --git a/profiles/applications/awesome.py b/profiles/applications/awesome.py
index d81f6283..72945275 100644
--- a/profiles/applications/awesome.py
+++ b/profiles/applications/awesome.py
@@ -1,6 +1,6 @@
 import archinstall
 
-installation.add_additional_packages("awesome xorg-server xorg-xrandr xorg-xinit xterm feh slock xscreensaver terminus-font-otb gnu-free-fonts ttf-liberation xsel")
+installation.add_additional_packages("awesome xorg-xrandr xterm feh slock terminus-font-otb gnu-free-fonts ttf-liberation xsel")
 
 with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'r') as xinitrc:
 	xinitrc_data = xinitrc.read()
@@ -11,7 +11,6 @@ for line in xinitrc_data.split('\n'):
 	if 'xterm' in line: xinitrc_data = xinitrc_data.replace(line, f"# {line}")
 
 xinitrc_data += '\n'
-xinitrc_data += 'xscreensaver -no-splash &\n'
 xinitrc_data += 'exec awesome\n'
 
 with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'w') as xinitrc:
@@ -21,13 +20,6 @@ with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'r') as awesome_r
 	awesome = awesome_rc_lua.read()
 
 awesome = awesome.replace('xterm', 'xterm -ls -xrm \\"XTerm*selectToClipboard: true\\"')
-#awesome = awesome.replace('{ "open terminal", terminal, ','{ "Chromium", "chromium" },\n    "open terminal", terminal, ')
-#awesome = awesome.replace('{ "open terminal", terminal, ', '{ "File handler", "nemo" },\n    "open terminal", terminal, ')
-awesome = awesome.replace('\nglobalkeys = gears.table.join(', 'globalkeys = gears.table.join(\n    awful.key({ modkey,    }, \"l\",  function() awful.spawn(\"xscreensaver-command -lock &\") end,\n')
-# "awk -i inplace -v RS='' '{gsub(/awful.key\\({ modkey,.*?}, \"Tab\",.*?\"client\"}\\),/, \"awful.key({ modkey,      }, \"Tab\",\n      function ()\n        awful.client.focus.byidx(-1)\n        if client.focus then\n          client.focus:raise()\n        end\n      end),\n    awful.key({ modkey, \"Shift\"    }, \"Tab\",\n    function ()\n      awful.client.focus.byidx(1)\n        if client.focus then\n           client.focus.raise()\n        end\n      end),\"); print}' {installation.mountpoint}/etc/xdg/awesome/rc.lua" : {"no-chroot" : true},
 
 with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'w') as awesome_rc_lua:
-	awesome_rc_lua.write(awesome)
-
-installation.arch_chroot('gsettings set org.nemo.desktop show-desktop-icons false')
-installation.arch_chroot('xdg-mime default nemo.desktop inode/directory application/x-gnome-saved-search')
\ No newline at end of file
+	awesome_rc_lua.write(awesome)
\ No newline at end of file
diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
new file mode 100644
index 00000000..1f2a20a1
--- /dev/null
+++ b/profiles/applications/gnome.py
@@ -0,0 +1,4 @@
+import archinstall
+
+installation.add_additional_packages("gnome gnome-extra gdm") # We'll create a gnome-minimal later, but for now, we'll avoid issues by giving more than we need.
+# Note: gdm should be part of the gnome group, but adding it here for clarity
\ No newline at end of file