Merging in master changes into grazzolini's typo fixes

1 files changed, 11 insertions, 19 deletions

diff --git a/profiles/awesome.py b/profiles/awesome.py
index fca0c4f1..27e7fc05 100644
--- a/profiles/awesome.py
+++ b/profiles/awesome.py
@@ -24,9 +24,6 @@ def _prep_function(*args, **kwargs):
 # through importlib.util.spec_from_file_location("awesome", "/somewhere/awesome.py")
 # or through conventional import awesome
 if __name__ == 'awesome':
-	# Install dependency profiles
-	installation.install_profile('xorg')
-
 	# Install the application awesome from the template under /applications/
 	awesome = archinstall.Application(installation, 'awesome')
 	awesome.install()
@@ -35,31 +32,26 @@ if __name__ == 'awesome':
 	editor = "nano"
 	filebrowser = "nemo gpicview-gtk3"
 	webbrowser = "chromium"
-	window_manager = "awesome"
 	virtulization = "qemu ovmf"
 	utils = "openssh sshfs git htop pkgfile scrot dhclient wget smbclient cifs-utils libu2f-host"
 
-	installation.add_additional_packages(f"{webbrowser} {utils} {window_manager} {virtulization} {filebrowser} {editor}")
 
+	installation.add_additional_packages(f"{webbrowser} {utils} {virtulization} {filebrowser} {editor}")
 
-	# with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'r') as awesome_rc_lua:
-	#	awesome_lua = awesome_rc_lua.read()
+	alacritty = archinstall.Application(installation, 'alacritty')
+	alacritty.install()
 
-	## Insert slock as a shortcut on Modkey+l   (window+l)
-	# awesome_lua = awesome_lua.replace(
-	# 	"\nglobalkeys = gears.table.join(",
-	# 	"globalkeys = gears.table.join(\n    awful.key({ modkey,    }, \"l\",  function() awful.spawn(\"slock &\") end,\n"
-	# )
+	# TODO: Copy a full configuration to ~/.config/awesome/rc.lua instead.
+	with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'r') as awesome_rc_lua:
+		awesome_lua = awesome_rc_lua.read()
 
-	## Insert some useful applications:
-	# 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, ')
+	## Replace xterm with alacritty for a smoother experience.
+	awesome_lua = awesome_rc_lua.replace('"xterm"', '"alacritty"')
 
-	# Insert "normal" alt-tab  via Modkey+Tab that most new users are used to
-	# "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_lua)
 
-	# with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'w') as awesome_rc_lua:
-	#	awesome_rc_lua.write(awesome_lua)
+	## TODO: Configure the right-click-menu to contain the above packages that were installed. (as a user config)
 	
 	## Remove some interfering nemo settings
 	installation.arch_chroot("gsettings set org.nemo.desktop show-desktop-icons false")