Merging in master changes into grazzolini's typo fixes

examples/guided.py

@@ -56,8 +56,6 @@ def perform_installation(device, boot_partition, language, mirrors):
 			if archinstall.storage['_guided']['packages'] and archinstall.storage['_guided']['packages'][0] != '':
 				installation.add_additional_packages(archinstall.storage['_guided']['packages'])
 
-			print('Installing:', archinstall.storage['_guided']['profile']['path'].strip())
-			time.sleep(10)
 			if 'profile' in archinstall.storage['_guided'] and len(profile := archinstall.storage['_guided']['profile']['path'].strip()):
 				installation.install_profile(profile)
 

profiles/applications/alacritty.py

@@ -0,0 +1,3 @@
+import archinstall
+
+installation.add_additional_packages("alacritty")

profiles/applications/awesome.py

@@ -1,5 +1,7 @@
 import archinstall
 
+installation.install_profile('xorg')
+
 installation.add_additional_packages(
 	"awesome xorg-xrandr xterm feh slock terminus-font-otb gnu-free-fonts ttf-liberation xsel"
 )
@@ -20,11 +22,3 @@ xinitrc_data += 'exec awesome\n'
 
 with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'w') as xinitrc:
 	xinitrc.write(xinitrc_data)
-
-with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'r') as awesome_rc_lua:
-	awesome = awesome_rc_lua.read()
-
-awesome = awesome.replace('xterm', 'xterm -ls -xrm \\"XTerm*selectToClipboard: true\\"')
-
-with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'w') as awesome_rc_lua:
-	awesome_rc_lua.write(awesome)

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:
+	alacritty = archinstall.Application(installation, 'alacritty')
-	#	awesome_lua = awesome_rc_lua.read()
+	alacritty.install()
 
-	## Insert slock as a shortcut on Modkey+l   (window+l)
+	# TODO: Copy a full configuration to ~/.config/awesome/rc.lua instead.
-	# awesome_lua = awesome_lua.replace(
+	with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'r') as awesome_rc_lua:
-	# 	"\nglobalkeys = gears.table.join(",
+		awesome_lua = awesome_rc_lua.read()
-	# 	"globalkeys = gears.table.join(\n    awful.key({ modkey,    }, \"l\",  function() awful.spawn(\"slock &\") end,\n"
-	# )
 
-	## Insert some useful applications:
+	## Replace xterm with alacritty for a smoother experience.
-	# awesome = awesome.replace('{ "open terminal", terminal, ','{ "Chromium", "chromium" },\n    "open terminal", terminal, ')
+	awesome_lua = awesome_rc_lua.replace('"xterm"', '"alacritty"')
-	# awesome = awesome.replace('{ "open terminal", terminal, ', '{ "File handler", "nemo" },\n    "open terminal", terminal, ')
 
-	# Insert "normal" alt-tab  via Modkey+Tab that most new users are used to
+	with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'w') as awesome_rc_lua:
-	# "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},
+		awesome_rc_lua.write(awesome_lua)
 
-	# with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'w') as awesome_rc_lua:
+	## TODO: Configure the right-click-menu to contain the above packages that were installed. (as a user config)
-	#	awesome_rc_lua.write(awesome_lua)
 	
 	## Remove some interfering nemo settings
 	installation.arch_chroot("gsettings set org.nemo.desktop show-desktop-icons false")