| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall.py | 4 | ||||
| -rw-r--r-- | deployments/workstation_aur.json | 4 |
diff --git a/archinstall.py b/archinstall.py index 4d85c9ce..f7d4c938 100644 --- a/archinstall.py +++ b/archinstall.py @@ -508,7 +508,7 @@ if __name__ == '__main__': if not 'profile' in args: args['profile'] = None if not 'profiles-path' in args: args['profiles-path'] = profiles_path if not 'rerun' in args: args['rerun'] = None - if not 'support-aur' in args: args['support-aur'] = True # Support adds yay (https://github.com/Jguer/yay) in installation steps. + if not 'aur-support' in args: args['aur-support'] = True # Support adds yay (https://github.com/Jguer/yay) in installation steps. if not 'ignore-rerun' in args: args['ignore-rerun'] = False if not 'localtime' in args: args['localtime'] = 'Europe/Stockholm' if args['country'] == 'SE' else 'GMT+0' # TODO: Arbitrary for now if not 'drive' in args: @@ -811,7 +811,7 @@ if __name__ == '__main__': entry.write('initrd /initramfs-linux.img\n') entry.write('options cryptdevice=UUID={UUID}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n'.format(UUID=UUID)) - if args['support-aur']: + if args['aur-support']: o = b''.join(sys_command('/usr/bin/arch-chroot /mnt sh -c "useradd -m -G wheel aibuilder"').exec()) o = b''.join(sys_command("/usr/bin/sed -i 's/# %wheel ALL=(ALL) NO/%wheel ALL=(ALL) NO/' /mnt/etc/sudoers").exec()) diff --git a/deployments/workstation_aur.json b/deployments/workstation_aur.json index 5cc59515..f64a794f 100644 --- a/deployments/workstation_aur.json +++ b/deployments/workstation_aur.json @@ -9,6 +9,7 @@ "_mediaplayer" : "lollypop gstreamer gst-plugins-good gnome-keyring", "_filebrowser" : "nemo gpicview-gtk3", "_webbrowser" : "chromium", + "_code_editor" : "sublime-text-dev", "_window_manager" : "awesome", "_window_manager_dependencies" : "xorg-server xorg-xrandr xorg-xinit xterm", "_window_manager_utilities" : "feh slock xscreensaver terminus-font-otb gnu-free-fonts ttf-liberation xsel", @@ -21,6 +22,9 @@ "Install workstation packages": { "pacman -Syy --noconfirm {_webbrowser} {_utils} {_mediaplayer} {_window_manager} {_window_manager_dependencies} {_window_manager_utilities} {_virtulization} {_filebrowser} {_editor}" : {"pass-args" : true} }, + "Install aur packages" : { + "yay -Syy --noconfirm {_code_editor}" : {"pass-args" : true} + }, "Setup virtulization" : { "sh -c \"Description=\\\"Bridge for virtual machines\\\"\nInterface=br0\nConnection=bridge\nBindsToInterfaces=(eno1)\nIP=no\nExecUpPost=\\\"ip link set dev br0 address $(cat /sys/class/net/eno1/address); IP=dhcp; ip_set\\\"\nExecDownPre=\\\"IP=dhcp\\\"\n\n## Ignore (R)STP and immediately activate the bridge\nSkipForwardingDelay=yes\"" : null }, |