diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh index 11dffee..74646b1 100755 --- a/arch-graphical-install-auto.sh +++ b/arch-graphical-install-auto.sh @@ -547,31 +547,8 @@ sed 's|%VERSION%|'$pacmanversion'|' -i /etc/pacman.d/hooks/pacmanconf.hook # nano echo "include "/usr/share/nano/*.nanorc"" > /etc/nanorc -# htop -echo "fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=-1 -hide_threads=0 -hide_kernel_threads=1 -hide_userland_threads=0 -shadow_other_users=0 -highlight_base_name=1 -highlight_megabytes=1 -highlight_threads=1 -tree_view=1 -header_margin=1 -detailed_cpu_time=1 -color_scheme=0 -delay=15 -left_meters=AllCPUs Memory Swap -left_meter_modes=1 1 1 -right_meters=Tasks LoadAverage Uptime -right_meter_modes=2 2 2 " > /home/${user}/.htoprc - -if ! [ "${version%-*}" == "libre-openrc" ] && ! [ "${version%-*}" == "openrc" ]; then - - # Install rc.local - echo "[Unit] +# Install rc.local +echo "[Unit] Description=/etc/rc.local compatibility [Service] @@ -580,22 +557,22 @@ ExecStart=/etc/rc.local RemainAfterExit=yes [Install] - WantedBy=multi-user.target" > /etc/systemd/system/rc-local.service - touch $RCLOCAL - chmod +x $RCLOCAL - systemctl enable rc-local.service - if ! grep '#!' $RCLOCAL; then - echo "#!/bin/bash" > $RCLOCAL - fi +WantedBy=multi-user.target" > /etc/systemd/system/rc-local.service +touch $RCLOCAL +chmod +x $RCLOCAL +systemctl enable rc-local.service +if ! grep '#!' $RCLOCAL; then + echo "#!/bin/bash" > $RCLOCAL +fi - if ! grep 'setcap cap_net_raw+ep /bin/ping' $RCLOCAL; then - echo "setcap cap_net_raw+ep /bin/ping" >> $RCLOCAL - fi +if ! grep 'setcap cap_net_raw+ep /bin/ping' $RCLOCAL; then + echo "setcap cap_net_raw+ep /bin/ping" >> $RCLOCAL +fi - # Install rc.shutdown +# Install rc.shutdown - echo "[Unit] +echo "[Unit] Description=/etc/rc.local.shutdown Compatibility ConditionFileIsExecutable=/etc/rc.local.shutdown DefaultDependencies=no @@ -609,13 +586,12 @@ StandardInput=tty RemainAfterExit=yes [Install] - WantedBy=multi-user.target" > /etc/systemd/system/rc-local-shutdown.service - touch $RCLOCALSHUTDOWN - chmod +x $RCLOCALSHUTDOWN - systemctl enable rc-local-shutdown.service - if ! grep '#!' $RCLOCALSHUTDOWN; then - echo "#!/bin/bash" > $RCLOCALSHUTDOWN - fi +WantedBy=multi-user.target" > /etc/systemd/system/rc-local-shutdown.service +touch $RCLOCALSHUTDOWN +chmod +x $RCLOCALSHUTDOWN +systemctl enable rc-local-shutdown.service +if ! grep '#!' $RCLOCALSHUTDOWN; then + echo "#!/bin/bash" > $RCLOCALSHUTDOWN fi # set desktop diff --git a/packages.txt b/packages.txt index 9081c26..25ec06c 100644 --- a/packages.txt +++ b/packages.txt @@ -1,13 +1,57 @@ -dhcpcd nano vim intel-ucode amd-ucode iwd lvm2 btrfs-progs arch-install-scripts +dhcpcd nano vim vim-spell-de intel-ucode amd-ucode iwd lvm2 btrfs-progs arch-install-scripts squashfs-tools dosfstools libisoburn grub efibootmgr dosfstools gptfdisk cronie memtest86+ -acpid dbus avahi ntp fail2ban +acpid dbus avahi ntp fail2ban alsa-utils alsa-tools bash-completion pulseaudio pulseaudio-bluetooth pulseaudio-equalizer pulseaudio-alsa pavucontrol pamixer -blueman bluez-tools +blueman bluez-tools pipewire pipewire-media-session +mesa-utils egl-wayland +vulkan-headers +vulkan-icd-loader +vulkan-intel +vulkan-mesa-layers +vulkan-radeon +vulkan-tools +pango papirus-icon-theme pass pass-otp +ttc-iosevka +ttf-bitstream-vera +ttf-carlito +ttf-dejavu +ttf-fantasque-sans-mono +ttf-fira-code +ttf-fira-mono +ttf-fira-sans +ttf-font-awesome +ttf-hack +ttf-jetbrains-mono +ttf-liberation +ttf-nerd-fonts-symbols-2048-em +ttf-nerd-fonts-symbols-common +ttf-opensans +gst-libav +gst-plugin-gtk +gst-plugin-pipewire +gst-plugins-bad +gst-plugins-bad-libs +gst-plugins-base +gst-plugins-base-libs +gst-plugins-good +gst-plugins-ugly +gvfs +gvfs-afc +gvfs-goa +gvfs-google +gvfs-gphoto2 +gvfs-mtp +gvfs-nfs +gvfs-smb +pdfmod +gstreamer keychain starship cups hplip alacritty -ark +arc-gtk-theme +arc-icon-theme +arc-solid-gtk-theme base base-devel linux linux-firmware bashtop browserpass @@ -29,7 +73,6 @@ git gnupg gparted grim -gvfs htop jre-openjdk lxde-gtk3 xfce4 mousepad @@ -65,5 +108,6 @@ xarchiver xdg-user-dirs xdg-user-dirs-gtk xorg-server xorg-xinit xorg-drivers -xournalpp libreoffice libwacom xf86-input-wacom +xournalpp libreoffice libreoffice-fresh-de +libwacom xf86-input-wacom yt-dlp