fix dark theme; disallow vt switch & xorg zap; remove gdm

1 files changed, 12 insertions, 18 deletions

diff --git a/archsetup b/archsetup
index 26a72b5..bf2e1eb 100755
--- a/archsetup
+++ b/archsetup
@@ -483,6 +483,16 @@ xorg() {
                                 xorg-xinput xorg-xkill ; do
         pacman_install $software
     done
+
+    # disallow vt switching or zapping the xorg server to bypass screen lock
+    cat << EOF > /etc/X11/xorg.conf.d/00-no-vt-or-zap.conf
+    Section "ServerFlags"
+        Option "DontVTSwitch" "True"
+        Option "DontZap"      "True"
+EndSection
+EOF
+    action="configuring xorg server" && display "task" "$action"
+    chmod 644 /etc/X11/xorg.conf.d/00-no-vt-or-zap.conf >> "$logfile" 2>&1 || error "error" "$action" "$?"
 }
 
 ### DWM Window Manager
@@ -649,7 +659,8 @@ desktop_environment() {
     done;
 
     for software in vimix-icon-theme vimix-cursors vimix-gtk-themes \
-                                     qt5ct adwaita-color-schemes; do
+                                     papirus-icon-theme qt6ct qt5ct \
+                                     adwaita-color-schemes; do
         aur_install $software
     done;
 
@@ -974,23 +985,6 @@ boot_ux() {
         sed -i "s/.*GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"rw loglevel=2 rd.systemd.show_status=auto rd.udev.log_level=2 nvme.noacpi=1 mem_sleep_default=deep nowatchdog quiet splash\"/g" /etc/default/grub
         grub-mkconfig -o /boot/grub/grub.cfg  >> "$logfile" 2>&1  || error "error" "" "$?"
     fi
-
-    # GDM
-    action="installing login manager and dependencies" && display "task" "$action"
-    pacman_install gdm
-    (systemctl enable gdm.service >> "$logfile" 2>&1) || error "error" "$action" "$?"
-
-    action="creating DWM entry for login manager" && display "task" "$action"
-    # Create DWM Entry for GDM
-    cat << EOF > /usr/share/xsessions/dwm.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Name=dwm
-Comment=Dynamic window manager
-Exec=startdwm
-Icon=dwm
-Type=XSession
-EOF
 }