瀏覽代碼

fix packages + remove unused files

Noah Vogt 13 小時之前
父節點
當前提交
faf4a6029a
共有 5 個文件被更改,包括 1 次插入246 次删除
  1. 0 93
      cryptarch.sh
  2. 0 36
      cryptchroot.sh
  3. 1 1
      norisa.sh
  4. 0 92
      testing/safe-arch.sh
  5. 0 24
      testing/safe-chroot.sh

+ 0 - 93
cryptarch.sh

@@ -1,93 +0,0 @@
-#!/bin/bash
-
-# This a lazy and DANGEROUS way to install Arch.
-# I do not recommend this to other people, ONLY
-# do this if you exactly understand EVERY SINGLE
-# LINE of this bash script. You'll thank me later.
-
-pacman -Sy --noconfirm dialog ||  { printf "Error at script start:\n\nAre you sure you're running this as the root user?\n\t(Tip: run 'whoami' to check)\n\nAre you sure you have an internet connection?\n\t(Tip: run 'ip a' to check)\n"; exit; }
-
-dialog --defaultno --title "WARNING!" --yesno "Do only run this script if you're a big brain who doesn't mind deleting one or more (this depends on your level of stupidity in the following steps) of his /dev/sd[x] drives. \n\nThis script is only really for me so I can save some of my precious time.\n\nNoah"  15 60 || { clear; exit; }
-
-dialog --no-cancel --inputbox "Enter the hostname." 10 60 2>comp
-
-clear
-lsblk -d | sed 's/0 disk/0 disk\\n/;s/POINT/POINT\\n/'
-read -p "Press any key to continue"
-
-dialog --no-cancel --inputbox "Enter the drive you want do install Arch on." 10 60 2>drive
-
-dialog --defaultno --title "Time Zone select" --yesno "Do you want use the default time zone(Europe/Zurich)?.\n\nPress no for select your own time zone"  10 60 && echo "Europe/Zurich" > tz.tmp || tzselect > tz.tmp
-
-dialog --no-cancel --inputbox "Enter swapsize in gb (only type in numbers)." 10 60 2>swapsize
-
-SIZE=$(cat swapsize)
-DRIVE=$(cat drive)
-
-timedatectl set-ntp true
-
-cat <<EOF | fdisk -W always /dev/${DRIVE}
-p
-g
-n
-
-
-+300M
-t
-1
-n
-
-
-+${SIZE}G
-t
-2
-19
-p
-n
-
-
-
-t
-3
-20
-p
-w
-EOF
-partprobe
-
-mkfs.fat -F32 /dev/${DRIVE}1
-mkswap /dev/${DRIVE}2
-swapon /dev/${DRIVE}2
-lsblk
-cryptsetup luksFormat /dev/${DRIVE}3
-cryptsetup luksOpen /dev/${DRIVE}3 cryptroot || exit 1
-mkfs.btrfs /dev/mapper/cryptroot
-
-mount /dev/mapper/cryptroot /mnt
-cd /mnt
-btrfs subvolume create @
-btrfs subvolume create @home
-cd
-umount /mnt
-
-mount -t btrfs -o subvol=@ /dev/mapper/cryptroot /mnt
-mkdir /mnt/home
-mount -t btrfs -o subvol=@home /dev/mapper/cryptroot /mnt/home
-mkdir /mnt/boot
-mount /dev/${DRIVE}1 /mnt/boot
-lsblk
-
-pacman -Sy --noconfirm archlinux-keyring
-
-pacstrap /mnt base base-devel linux linux-firmware networkmanager git neovim btrfs-progs cryptsetup efibootmgr
-
-genfstab -U /mnt >> /mnt/etc/fstab
-cat tz.tmp > /mnt/tzfinal.tmp
-rm tz.tmp
-mv drive /mnt
-mv comp /mnt/etc/hostname
-cp cryptchroot.sh /mnt/chroot.sh && arch-chroot /mnt bash chroot.sh && rm /mnt/chroot.sh /mnt/drive /mnt/tzfinal.tmp
-
-dialog --defaultno --title "Final Qs" --yesno "Reboot computer?"  5 30 && reboot
-dialog --defaultno --title "Final Qs" --yesno "Return to chroot environment?"  6 30 && arch-chroot /mnt
-clear

+ 0 - 36
cryptchroot.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# This a lazy and DANGEROUS way to install Arch.
-# I do not recommend this to other people, ONLY
-# do this if you exactly understand EVERY SINGLE
-# LINE of this bash script. You'll thank me later.
-
-TZuser=$(cat tzfinal.tmp)
-DRIVE=$(cat drive)
-
-passwd
-
-ln -sf /usr/share/zoneinfo/$TZuser /etc/localtime
-
-hwclock --systohc
-
-echo "LANG=en_GB.UTF-8" >> /etc/locale.conf
-echo "en_GB.UTF-8 UTF-8" >> /etc/locale.gen
-locale-gen
-
-pacman --noconfirm --needed -S networkmanager
-systemctl enable NetworkManager
-
-pacman --noconfirm --needed -S grub && 
-    grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB &&
-    grub-mkconfig -o /boot/grub/grub.cfg
-
-sed -i 's/^MODULES=()/MODULES=(btrfs)/' /etc/mkinitcpio.conf
-sed -i 's/^HOOKS=(base udev autodetect modconf block/HOOKS=(base udev autodetect modconf block encrypt/' /etc/mkinitcpio.conf
-mkinitcpio -p linux
-
-UUID="$(blkid | grep "${DRIVE}3" | awk '{print $2}' | tr -d '"')"
-echo "UUID: $UUID"
-
-sed -i "s/quiet/cryptdevice=${UUID}:cryptroot root=\/dev\/mapper\/cryptroot/" /etc/default/grub
-grub-mkconfig -o /boot/grub/grub.cfg

+ 1 - 1
norisa.sh

@@ -197,7 +197,7 @@ doas -u "$username" /home/"$username"/.local/src/dotfiles/apply-dotfiles
 # Download Packages from the Official Repos
 # TODO: add element-desktop back
 echo -e "\e[0;30;34mInstalling packages from official repos ...\e[0m"
-pacman -S --noconfirm --needed xorg-server xf86-video-vesa xf86-video-fbdev shellcheck neovim ranger xournalpp ffmpeg obs-studio sxiv arandr man-db brightnessctl unzip python mupdf-gl mediainfo highlight pulseaudio-alsa pulsemixer pamixer ttf-linux-libertine calcurse xclip noto-fonts-emoji imagemagick gimp xorg-setxkbmap wavemon texlive dash unifetch htop wireless_tools alsa-utils acpi zip libreoffice nm-connection-editor dunst libnotify dosfstools mpv xorg-xinput cpupower zsh zsh-syntax-highlighting newsboat nomacs pcmanfm openbsd-netcat powertop mupdf-tools nomacs stow zsh-autosuggestions xf86-video-amdgpu xf86-video-intel xf86-video-nouveau npm fzf unclutter ccls mpd mpc ncmpcpp pavucontrol strawberry smartmontools firefox python-pynvim python-pylint tesseract-data-deu tesseract-data-eng keepassxc ueberzug img2pdf dust ctags python-wand python-termcolor python-black jdk-openjdk ripgrep lf ungoogled-chromium-bin ttf-jetbrains-mono-nerd foliate coreutils curl fish foot fuzzel gjs gnome-bluetooth-3.0 gnome-control-center gnome-keyring gobject-introspection grim gtk3 gtk-layer-shell libdbusmenu-gtk3 meson nlohmann-json plasma-browser-integration playerctl polkit-gnome python-pywal sassc slurp swayidle typescript xorg-xrandr webp-pixbuf-loader wireplumber yad ydotool gojq hyprland python-poetry python-build python-pillow ttf-material-symbols-variable-git ttf-space-mono-nerd wlogout kitty shfmt ruff luarocks rust-analyzer hyprland-guiutils waybar socat hyprlock brave-bin clang swaync bat wl-clipboard syncthing python-debug ghostty awww kitty tokei gemini-cli hypridle tlp || pacman_error_exit
+pacman -S --noconfirm --needed xorg-server xf86-video-vesa xf86-video-fbdev shellcheck neovim ranger xournalpp ffmpeg obs-studio sxiv arandr man-db brightnessctl unzip python mupdf-gl mediainfo highlight pulseaudio-alsa pulsemixer pamixer ttf-linux-libertine calcurse xclip noto-fonts-emoji imagemagick gimp xorg-setxkbmap wavemon texlive dash unifetch htop wireless_tools alsa-utils acpi zip libreoffice nm-connection-editor dunst libnotify dosfstools mpv xorg-xinput cpupower zsh zsh-syntax-highlighting newsboat nomacs pcmanfm openbsd-netcat powertop mupdf-tools nomacs stow zsh-autosuggestions xf86-video-amdgpu xf86-video-intel xf86-video-nouveau npm fzf unclutter ccls mpd mpc ncmpcpp pavucontrol strawberry smartmontools firefox python-pynvim python-pylint tesseract-data-deu tesseract-data-eng keepassxc ueberzug img2pdf dust ctags python-wand python-termcolor python-black jdk-openjdk ripgrep lf ungoogled-chromium-bin ttf-jetbrains-mono-nerd foliate coreutils curl fish foot fuzzel gjs gnome-bluetooth-3.0 gnome-control-center gnome-keyring gobject-introspection grim gtk3 gtk-layer-shell libdbusmenu-gtk3 meson nlohmann-json plasma-browser-integration playerctl polkit-gnome python-pywal sassc slurp swayidle typescript xorg-xrandr webp-pixbuf-loader wireplumber yad ydotool gojq hyprland python-poetry python-build python-pillow ttf-material-symbols-variable-git ttf-space-mono-nerd wlogout kitty shfmt ruff luarocks rust-analyzer hyprland-guiutils waybar socat hyprlock brave-bin clang swaync bat wl-clipboard syncthing python-debugpy ghostty awww kitty tokei gemini-cli hypridle tlp || pacman_error_exit
 
 # Install AUR Packages
 echo -e "\e[0;30;34mInstalling packages from AUR ...\e[0m"

+ 0 - 92
testing/safe-arch.sh

@@ -1,92 +0,0 @@
-#!/bin/bash
-
-# This a lazy and DANGEROUS way to install Arch.
-# I do not recommend this to other people, ONLY
-# do this if you exactly understand EVERY SINGLE
-# LINE of this bash script. You'll thank me later.
-
-pacman -Sy --noconfirm dialog ||  { printf "Error at script start:\n\nAre you sure you're running this as the root user?\n\t(Tip: run 'whoami' to check)\n\nAre you sure you have an internet connection?\n\t(Tip: run 'ip a' to check)\n"; exit; }
-
-dialog --defaultno --title "WARNING!" --yesno "Do only run this script if you're a big brain who doesn't mind deleting one or more (this depends on your level of stupidity in the following steps) of his /dev/sd[x] drives. \n\nThis script is only really for me so I can save some of my precious time.\n\nNoah"  15 60 || { clear; exit; }
-
-dialog --no-cancel --inputbox "Enter the hostname." 10 60 2>comp
-
-clear
-lsblk -d | sed 's/0 disk/0 disk\\n/;s/POINT/POINT\\n/'
-read -p "Press any key to continue"
-
-dialog --no-cancel --inputbox "Enter the drive you want do install Arch on." 10 60 2>drive
-
-dialog --defaultno --title "Time Zone select" --yesno "Do you want use the default time zone(Europe/Zurich)?.\n\nPress no for select your own time zone"  10 60 && echo "Europe/Zurich" > tz.tmp || tzselect > tz.tmp
-
-dialog --no-cancel --inputbox "Enter swapsize in gb (only type in numbers)." 10 60 2>swapsize
-
-SIZE=$(cat swapsize)
-DRIVE=$(cat drive)
-read -p "Press any key to continue"
-
-timedatectl set-ntp true
-read -p "Press any key to continue"
-
-cat <<EOF | fdisk -W always /dev/${DRIVE}
-p
-g
-n
-
-
-+1024M
-t
-4
-n
-
-
-+${SIZE}G
-t
-2
-19
-p
-n
-
-
-
-t
-3
-20
-p
-w
-EOF
-partprobe
-read -p "Press any key to continue"
-
-yes | mkfs.ext4 /dev/${DRIVE}3
-read -p "Press any key to continue"
-mkswap /dev/${DRIVE}2
-read -p "Press any key to continue"
-swapon /dev/${DRIVE}2
-read -p "Press any key to continue"
-mount /dev/${DRIVE}3 /mnt
-read -p "Press any key to continue"
-
-pacman -Sy --noconfirm archlinux-keyring
-read -p "Press any key to continue"
-
-pacstrap /mnt base base-devel linux linux-firmware networkmanager rsync
-read -p "Press any key to continue"
-
-genfstab -U /mnt >> /mnt/etc/fstab
-read -p "Press any key to continue"
-cat tz.tmp > /mnt/tzfinal.tmp
-read -p "Press any key to continue"
-rm tz.tmp
-read -p "Press any key to continue"
-mv drive /mnt
-read -p "Press any key to continue"
-mv comp /mnt/etc/hostname
-read -p "Press any key to continue"
-curl https://raw.githubusercontent.com/noahvogt/norisa/main/testing/safe-chroot.sh > /mnt/chroot.sh && arch-chroot /mnt bash chroot.sh && rm /mnt/chroot.sh
-read -p "Press any key to continue"
-
-dialog --defaultno --title "Final Qs" --yesno "Reboot computer?"  5 30 && reboot
-dialog --defaultno --title "Final Qs" --yesno "Return to chroot environment?"  6 30 && arch-chroot /mnt
-clear
-

+ 0 - 24
testing/safe-chroot.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# This a lazy and DANGEROUS way to install Arch.
-# I do not recommend this to other people, ONLY
-# do this if you exactly understand EVERY SINGLE
-# LINE of this bash script. You'll thank me later.
-
-passwd
-
-TZuser=$(cat tzfinal.tmp)
-
-ln -sf /usr/share/zoneinfo/$TZuser /etc/localtime
-
-hwclock --systohc
-
-echo "LANG=en_GB.UTF-8" >> /etc/locale.conf
-echo "en_GB.UTF-8 UTF-8" >> /etc/locale.gen
-locale-gen
-
-pacman --noconfirm --needed -S networkmanager
-systemctl enable NetworkManager
-
-DRIVE=$(cat drive)
-pacman --noconfirm --needed -S grub && grub-install --target=i386-pc /dev/${DRIVE} && grub-mkconfig -o /boot/grub/grub.cfg