| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | profiles/applications/alacritty.py | 3 | ||||
| -rw-r--r-- | profiles/applications/awesome.py | 12 | ||||
| -rw-r--r-- | profiles/awesome.py | 30 |
diff --git a/profiles/applications/alacritty.py b/profiles/applications/alacritty.py new file mode 100644 index 00000000..aab64bb4 --- /dev/null +++ b/profiles/applications/alacritty.py @@ -0,0 +1,3 @@ +import archinstall + +installation.add_additional_packages("alacritty")
\ No newline at end of file diff --git a/profiles/applications/awesome.py b/profiles/applications/awesome.py index c0f0951d..db7e8f4f 100644 --- a/profiles/applications/awesome.py +++ b/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" ) @@ -19,12 +21,4 @@ xinitrc_data += '\n' 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) + xinitrc.write(xinitrc_data)
\ No newline at end of file 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") |