feat: a lot of updates!

README.md

@@ -7,7 +7,7 @@ more!
 Follow the [Pre-installation](https://wiki.archlinux.org/title/Installation_guide#Pre-installation).
 Once you chrooted in the system, clone this script
 ```bash
-git clone https://git.maby.dev/ange/archinstall /tmp/ai && cd $_
+git clone https://git.maby.dev/ange/archinstall /tmp/ai && cd "$_"
 ```
 
 To install the base system, run:
@@ -16,13 +16,13 @@ $EDITOR config
 ./base.sh
 ```
 
-If you want to install a gui
+If you want a desktop install:
 ```bash
-$EDITOR ./gui/config
-./gui/install.sh
+$EDITOR ./desktop/config
+./desktop/install.sh
 
-$EDITOR ./gui/$GUI/config
-./gui/$GUI/install.sh
+$EDITOR ./desktop/$WM/config
+./desktop/$WM/install.sh
 ```
 
 For the dotfiles, run the script as the newly created user:

config

@@ -1,6 +1,7 @@
 # User Variables
 # Comment to disable
 
+#swapfile=2048
 swapfile=auto # auto|MB
 
 username=ange
@@ -23,15 +24,15 @@ pkg=(
     fuse
     fzf
     git
-    gnu-netcat
     htop
     jq
-    linux{,-lts,-firmware} mkinitcpio
+    linux{,-lts,-firmware} mkinitcpio {amd,intel}-ucode
     lsof
     man-{db,pages} tldr
     neofetch
     neovim{,-lspconfig} python-pynvim ripgrep tree-sitter-cli
-    networkmanager iptables-nft wireguard-tools
+    networkmanager iptables-nft wireguard-tools bind gnu-netcat
+    opendoas
     p7zip unrar
     podman{,-compose}
     ranger
@@ -39,13 +40,10 @@ pkg=(
     renameutils perl-rename
     rsync
     terminus-font awesome-terminal-fonts
+    tlp
     tree
     udisks2
     zsh
 )
 
-laptop_pkg=(
-    tlp
-)
-
 # vim: ft=sh

desktop/config

@@ -8,13 +8,14 @@ pkg=(
     flameshot
     gammastep
     imagemagick
-    keepassxc
     materia-{gtk-theme,kde} papirus-icon-theme gtk-engine-murrine
+    monero
     mpv
     noto-fonts{,-cjk,-emoji} ttf-{dejavu,liberation} otf-font-awesome
+    pass{,-otp}
     pcmanfm
-    pipewire{,-pulse,-jack} wireplumber pavucontrol playerctl
     polkit-gnome
+    wireplumber pipewire-pulse pavucontrol playerctl
     xdg-user-dirs
     yt-dlp
     zenity
@@ -23,9 +24,7 @@ pkg=(
 flatpakpkg=(
     com.valvesoftware.Steam
     net.lutris.Lutris
-    org.getmonero.Monero
     org.gimp.GIMP
-    org.mozilla.Thunderbird
     org.mozilla.firefox
 )
 

desktop/dwm/config

@@ -5,7 +5,7 @@ pkg=(
     autorandr
     i3lock xss-lock
     picom
-    xorg-{server,xhost,xinit,xrandr,xsetroot} xclip
+    xorg-{server,xinit,xrandr,xsetroot} xclip
 )
 
 # vim: ft=sh

desktop/dwm/src/install.sh

@@ -11,9 +11,7 @@ case "$(lspci -k | grep -A3 -E '(VGA|3D)')" in
         pac xf86-video-intel
         ;;
     *nouveau*)
-        pac xf86-video-nouveau
-        ;;
-    *nvidia*)
-        pac nvidia{,-utils}
+        # https://bugs.freedesktop.org/show_bug.cgi?id=94844#c3
+        #pac xf86-video-nouveau
         ;;
 esac

desktop/src/install.sh

@@ -1,20 +1,20 @@
 #!/bin/bash -ex
 
-pac "${pkg[@]}" flatpak xdg-desktop-portal-gtk
+pac "${pkg[@]}" flatpak xdg-desktop-portal-gtk mesa
 flatpak install -y "${flatpakpkg[@]}"
 
 case "$(lspci -k | grep -E '(VGA|3D)')" in
     *AMD*)
-        pac mesa vulkan-radeon
+        pac vulkan-radeon
         modules=amdgpu
         ;;
     *Intel*)
-        pac mesa vulkan-intel
+        pac vulkan-intel
         modules=i915
         ;;
     *NVIDIA*)
-        pac nvidia{,-utils,-settings}
-        modules='nvidia nvidia_modeset nvidia_uvm nvidia_drm'
+        #pac vulkan-nvk
+        modules=nouveau
         ;;
 esac
 

rootfs/etc/NetworkManager/NetworkManager.conf

@@ -1,3 +1,2 @@
 [main]
 dns=systemd-resolved
-systemd-resolved=false

rootfs/etc/doas.conf

@@ -0,0 +1 @@
+permit persist :wheel

rootfs/etc/systemd/resolved.conf

@@ -6,9 +6,11 @@
 #  any later version.
 #
 # Entries in this file show the compile time defaults. Local configuration
-# should be created by either modifying this file, or by creating "drop-ins" in
-# the resolved.conf.d/ subdirectory. The latter is generally recommended.
-# Defaults can be restored by simply deleting this file and all drop-ins.
+# should be created by either modifying this file (or a copy of it placed in
+# /etc/ if the original file is shipped in /usr/), or by creating "drop-ins" in
+# the /etc/systemd/resolved.conf.d/ directory. The latter is generally
+# recommended. Defaults can be restored by simply deleting the main
+# configuration file and all drop-ins located in /etc/.
 #
 # Use 'systemd-analyze cat-config systemd/resolved.conf' to display the full config.
 #
@@ -20,7 +22,7 @@
 # Google:     8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
 # Quad9:      9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
 DNS=9.9.9.9#dns.quad9.net
-FallbackDNS=1.1.1.1 8.8.8.8
+#FallbackDNS=1.1.1.1#cloudflare-dns.com 9.9.9.9#dns.quad9.net 8.8.8.8#dns.google 2606:4700:4700::1111#cloudflare-dns.com 2620:fe::9#dns.quad9.net 2001:4860:4860::8888#dns.google
 Domains=~.
 #DNSSEC=no
 DNSOverTLS=yes

rootfs/etc/xdg/reflector/reflector.conf

@@ -0,0 +1,4 @@
+--save /etc/pacman.d/mirrorlist
+--protocol https
+--latest 5
+--sort rate

src/install.sh

@@ -10,28 +10,17 @@ locale-gen
 echo "LANG=$lang.UTF-8" > /etc/locale.conf
 echo "$hostname" > /etc/hostname
 
-# Drivers
-case "$(lscpu | grep Vendor)" in
-    *AuthenticAMD*) cpu=amd   ;;
-    *GenuineIntel*) cpu=intel ;;
-esac
 sed -i '/^HOOKS=(/s/filesystems/encrypt filesystems/' /etc/mkinitcpio.conf
 
 # Services
-pac "$cpu-ucode"
-systemctl enable     \
-    NetworkManager   \
-    ip6tables        \
-    iptables         \
-    podman.socket    \
-    reflector.timer  \
+systemctl enable \
+    NetworkManager \
+    ip6tables \
+    iptables \
+    reflector.timer \
     systemd-resolved \
-    systemd-timesyncd
-
-if ls -d /sys/class/power_supply/BAT*/ > /dev/null 2>&1; then
-    pac "${laptop_pkg[@]}"
-    systemctl enable tlp
-fi
+    systemd-timesyncd \
+    tlp
 
 # Users
 echo "root:$root_passwd" | chpasswd
@@ -39,8 +28,6 @@ useradd -mG wheel,video "$username" -s "${default_shell-/bin/bash}"
 echo "$username:$user_passwd" | chpasswd
 su "$username" -c 'xdg-user-dirs-update' 2> /dev/null || true
 
-sed -i '/^#\s*%wheel\s\+ALL=(ALL:ALL)\s\+ALL/s/^#\s*//' /etc/sudoers
-
 # Bootloader
 bootctl install
 
@@ -55,7 +42,6 @@ options="${options}root=$root"
 
 for f in /boot/loader/entries/*.conf; do
     cat << EOF >> "$f"
-initrd  /$cpu-ucode.img
 options $options rw
 EOF
 done