diff --git a/TODO b/TODO index 3ba8aa4..a5ac0cd 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ install steam, wine and lib32 multilib pipwire-pulseaudio as root to X11 -dynamic colors color to kernel cmdline +flatpack teams diff --git a/configure.sh b/configure.sh index 21b3d2d..cfdf694 100755 --- a/configure.sh +++ b/configure.sh @@ -6,7 +6,7 @@ set -e _BASENAME=$(basename "$0") _DIRNAME=$(dirname "$0") cd "$(dirname "$0")" || _exit 1 -source functions.sh +source scripts/functions.sh ### install packages sed -i "s|^#Color.*|Color|" /etc/pacman.conf diff --git a/functions.sh b/functions.sh deleted file mode 100644 index 2a2b4f0..0000000 --- a/functions.sh +++ /dev/null @@ -1,28 +0,0 @@ -function _template { - source ./templates/variables - sed -i "s|{{foreground}}|$foreground|" "$1" - sed -i "s|{{foreground_light}}|$foreground_light|" "$1" - sed -i "s|{{foreground_lighter}}|$foreground_lighter|" "$1" - sed -i "s|{{background}}|$background|" "$1" - sed -i "s|{{background_light}}|$background_light|" "$1" - sed -i "s|{{background_dark}}|$background_dark|" "$1" - sed -i "s|{{background_darker}}|$background_darker|" "$1" - sed -i "s|{{cursor_color}}|$cursor_color|" "$1" - sed -i "s|{{color0}}|$color0|" "$1" - sed -i "s|{{color8}}|$color8|" "$1" - sed -i "s|{{color1}}|$color1|" "$1" - sed -i "s|{{color9}}|$color9|" "$1" - sed -i "s|{{color2}}|$color2|" "$1" - sed -i "s|{{color10}}|$color10|" "$1" - sed -i "s|{{color3}}|$color3|" "$1" - sed -i "s|{{color11}}|$color11|" "$1" - sed -i "s|{{color4}}|$color4|" "$1" - sed -i "s|{{color12}}|$color12|" "$1" - sed -i "s|{{color5}}|$color5|" "$1" - sed -i "s|{{color13}}|$color13|" "$1" - sed -i "s|{{color6}}|$color6|" "$1" - sed -i "s|{{color14}}|$color14|" "$1" - sed -i "s|{{color7}}|$color7|" "$1" - sed -i "s|{{color15}}|$color15|" "$1" -} - diff --git a/install.sh b/install.sh index 9b74588..f3a428b 100755 --- a/install.sh +++ b/install.sh @@ -8,6 +8,7 @@ PACSTRAP_EXTRA_ARGS="-c" ### Switch to the script directory cd "$(dirname "$0")" DIRNAME="$(pwd)" +source scripts/functions.sh ### Format disk sgdisk --clear \ @@ -70,9 +71,10 @@ genfstab -U /mnt | sed "s/subvolid=[0-9]\{3\},//" > /mnt/etc/fstab sed -i "/^HOOKS/s|block|block encrypt btrfs|" /mnt/etc/mkinitcpio.conf sed -i "s|^BINARIES.*|BINARIES=\(btrfs\)|" /mnt/etc/mkinitcpio.conf -printf "cryptdevice=UUID=%s:rootfs root=UUID=%s rootflags=subvol=@ rw initrd=\\intel-ucode.img initrd=\\initramfs-linux.img loglevel=3 vt.default_red=40,224,152,229,97,198,86,171,40,224,152,229,97,198,86,171 vt.default_grn=44,108,195,192,175,120,182,178,44,108,195,192,175,120,182,178 vt.default_blu=52,117,121,123,239,221,194,191,52,117,121,123,239,221,194,191 intel_iommu=on iommu=pt" \ +printf "cryptdevice=UUID=%s:rootfs root=UUID=%s rootflags=subvol=@ rw initrd=\\intel-ucode.img initrd=\\initramfs-linux.img loglevel=3 %s intel_iommu=on iommu=pt" \ "$(blkid --match-token PARTLABEL=SYS -s UUID -o value)" \ "$(blkid --match-token LABEL=root -s UUID -o value)" \ + "$(_kernel_colors)" \ > /mnt/etc/kernel/cmdline sed -i 's|^#default_uki.*|default_uki="/boot/arch-linux.efi"|' /mnt/etc/mkinitcpio.d/linux.preset @@ -93,7 +95,7 @@ sed -i 's|^root:.*|root:$y$j9T$BPO20nCgFZ8NuDn6LZ6KU0$681FWXbptNoLEbIKmyRtivt1NC printf "PermitRootLogin yes" > /mnt/etc/ssh/sshd_config.d/99-permitrootlogin.conf # Configure network -cp network/00-wired.network /mnt/etc/systemd/network/0-wired.network +cp network/00-wired.network /mnt/etc/systemd/network/00-wired.network cp network/resolved.conf /mnt/etc/systemd/resolved.conf cd /mnt/etc ln -sf ../run/systemd/resolve/stub-resolv.conf resolv.conf @@ -111,4 +113,4 @@ cp links/tty/issue /mnt/etc/issue # Enable services arch-chroot /mnt systemctl enable sshd.service systemd-networkd.service systemd-timesyncd.service systemd-resolved.service -echo "DONE !!! Dont forget to change passwords" +echo "DONE !!! Dont forget to change passwords and deny PermitRootLogin on /etc/ssh/sshd_config.d/99-permitrootlogin.conf after installation"