From c9690c55b2ebfdba690c7bf424a5ad78998d69b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?= Date: Tue, 16 Mar 2021 17:56:44 +0300 Subject: [PATCH] Improved install script --- arch-setup/AUR.txt | 5 +++- arch-setup/arch-setup.sh | 2 +- arch-setup/chroot.sh | 27 ++++++++++++++----- arch-setup/nonAUR.txt | 8 ++++++ arch-setup/plist.sh | 4 +-- .../1-yigitcolakoglu@hotmail.com.muttrc | 3 +-- .../accounts/1-yigitcolakoglu@hotmail.com.sig | 1 - 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/arch-setup/AUR.txt b/arch-setup/AUR.txt index 99651c93..682d24f3 100644 --- a/arch-setup/AUR.txt +++ b/arch-setup/AUR.txt @@ -5,7 +5,8 @@ betterdiscord betterdiscordctl-git betterlockscreen bitwarden -bitwarden-dmenu +bitwarden-cli +canon-pixma-ts5055-complete canto-next-git capt-src checkupdates+aur @@ -28,12 +29,14 @@ jetbrains-toolbox ly mailspring mconnect-git +mutt-wizard ncpamixer nerd-fonts-hack notion-app notion-enhancer numix-icon-theme-git nvm +pam-gnupg perl-checkupdates-aur perl-www-aur pipes.sh diff --git a/arch-setup/arch-setup.sh b/arch-setup/arch-setup.sh index 9d384328..83edde63 100755 --- a/arch-setup/arch-setup.sh +++ b/arch-setup/arch-setup.sh @@ -44,7 +44,7 @@ echo "[INFO]: Keyfile saved to /root/.keys/root-keyfile" cryptsetup open --key-file="/root/.keys/root-keyfile" "$device"3 root mkfs.ext4 /dev/mapper/root mkdir /mnt/sys -mount "$device"1 /mnt/sys +mount /dev/mapper/root /mnt/sys mkdir /mnt/sys/boot mount "$device"1 /mnt/sys/boot diff --git a/arch-setup/chroot.sh b/arch-setup/chroot.sh index 1eaa91a0..4cf4d153 100755 --- a/arch-setup/chroot.sh +++ b/arch-setup/chroot.sh @@ -5,19 +5,16 @@ hwclock --systohc echo -e "en_US.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8" > /etc/locale.gen locale-gen echo "LANG=en_US.UTF-8" > /etc/locale.conf -echo "KEYMAP=trq" > /etc/vconsole.conf echo "tatooine" > /etc/hostname -git clone https://aur.archlinux.org/yay.git /tmp/yay -(cd /tmp/yay; makepkg -si) systemctl enable fstrim.timer echo -e "127.0.0.1 localhost\n::1 localhost\n127.0.0.1 tatooine.localdomain tatooine" > /etc/hosts cat << EOF > /etc/mkinitcpio.conf -MODULES=(vfat) +MODULES=(vfat i915) BINARIES=() FILES=() -HOOKS=(base udev autodetect keyboard keymap consolefont modconf block encrypt filesystems fsck) +HOOKS=(base udev plymouth autodetect keyboard keymap consolefont modconf block plymouth-encrypt openswap resume filesystems fsck) EOF cat << EOF > /etc/initcpio/hooks/openswap @@ -43,7 +40,7 @@ build () help () { cat< ~/.dotfiles/chroot/nonAUR.txt -pacman -Qqm > ~/.dotfiles/chroot/AUR.txt +pacman -Qqe | grep -v "$(pacman -Qqm)" | grep -v yay > ~/.dotfiles/arch-setup/nonAUR.txt +pacman -Qqm | grep -v canon > ~/.dotfiles/arch-setup/AUR.txt diff --git a/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.muttrc b/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.muttrc index 1060385c..b144d799 100644 --- a/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.muttrc +++ b/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.muttrc @@ -8,7 +8,7 @@ set folder = "/home/yigit/.local/share/mail/yigitcolakoglu@hotmail.com" set header_cache = /home/yigit/.cache/mutt-wizard/yigitcolakoglu@hotmail.com/headers set message_cachedir = /home/yigit/.cache/mutt-wizard/yigitcolakoglu@hotmail.com/bodies set mbox_type = Maildir -set signature = "/home/yigit/.config/mutt/accounts/1-yigitcolakoglu@hotmail.com.sig" +set signature = "/home/yigit/.config/mutt/accounts/1-yigitcolakoglu@hotmail.com.sig" bind index,pager gg noop @@ -18,7 +18,6 @@ bind index,pager C noop bind index gg first-entry unmailboxes * unalternates * -unset signature unmacro index o macro index o "mw -y yigitcolakoglu@hotmail.com" "run mbsync to sync yigitcolakoglu@hotmail.com" diff --git a/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.sig b/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.sig index 068c43c8..6ffcdf79 100644 --- a/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.sig +++ b/mail/mutt/accounts/1-yigitcolakoglu@hotmail.com.sig @@ -1,4 +1,3 @@ --- Yiğit Çolakoğlu =================== Senior Student at Ted Ankara College Foundation High School