diff --git a/install.sh b/install.sh index 8390764..beff07b 100755 --- a/install.sh +++ b/install.sh @@ -235,13 +235,15 @@ set_locale() { echo "done" echo -n "Setting keyboard layout..." - IFS=, read -r dummy XKBD_LAYOUT XKBD_MODEL XKBD_VARIANT XKBD_OPTIONS <<< "$(grep "^$KBD_LAYOUT," -m1 keyboard-map.csv)" + # systemd and others may read from here echo "KEYMAP=$KBD_LAYOUT" > /mnt/etc/vconsole.conf + # while openrc and others may read from here echo "keymap=\"$XKBD_LAYOUT\"" > /mnt/etc/conf.d/keymaps + # and X11 will read from here local XKBD_CONF="/mnt/etc/X11/xorg.conf.d/00-keyboard.conf" mkdir -p $(dirname $XKBD_CONF) echo "Section \"InputClass\"" > $XKBD_CONF diff --git a/packages.csv b/packages.csv index d96bf4b..90e2869 100644 --- a/packages.csv +++ b/packages.csv @@ -11,8 +11,6 @@ SRC,https://github.com/augustogunsch/dwm-bar,Dwm status bar PAC,feh,Image viewer PAC,firejail,Sandbox program PAC,fzf,Fuzzy finder -PAC,gcc,C compiler -PAC,go,Go compiler PAC,gvim,Text editor PAC,libnotify,Implementation of the Desktop Notifications Specification PAC,libxinerama,X11 extension which provides support for extending a desktop across multiple displays diff --git a/post-install.sh b/post-install.sh index 8a53810..aa4714f 100755 --- a/post-install.sh +++ b/post-install.sh @@ -570,8 +570,12 @@ install_packages() { quiet pacman -Sqyu --noconfirm echo "done" - install sudo + # essential packages + # these should be installed before as they are needed to build other packages + install sudo "Tool for running a command as other user" install git "Version control system" + install go "Go compiler" + install gcc "C compiler" install_loop }