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

4 files changed, 21 insertions, 28 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
 }
 
 
diff --git a/dotfiles/system/.config/gtk-3.0/settings.ini b/dotfiles/system/.config/gtk-3.0/settings.ini
index 4aa03ad..2023ae6 100644
--- a/dotfiles/system/.config/gtk-3.0/settings.ini
+++ b/dotfiles/system/.config/gtk-3.0/settings.ini
@@ -1,7 +1,7 @@
 [Settings]
 gtk-print-backends=file,cups,pdf
-gtk-theme-name=vimix-dark-compact-doder
-gtk-icon-theme-name=Adwaita
+gtk-theme-name=Adwaita-dark
+gtk-icon-theme-name=Papirus-Dark
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-name=Vimix-white-cursors
 gtk-cursor-theme-size=0
@@ -15,3 +15,4 @@ gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
 gtk-xft-rgba=rgb
+gtk-application-prefer-dark-theme=1
\ No newline at end of file
diff --git a/dotfiles/system/.config/qt5ct/qt5ct.conf b/dotfiles/system/.config/qt5ct/qt5ct.conf
index 58a1c41..56a88db 100644
--- a/dotfiles/system/.config/qt5ct/qt5ct.conf
+++ b/dotfiles/system/.config/qt5ct/qt5ct.conf
@@ -1,13 +1,13 @@
 [Appearance]
-color_scheme_path=/usr/share/qt5ct/colors/airy.conf
-custom_palette=false
-icon_theme=Vimix-white
+color_scheme_path=/usr/share/qt5ct/colors/darker.conf
+custom_palette=true
+icon_theme=Papirus-Dark
 standard_dialogs=default
-style=Adwaita
+style=Adwaita-Dark
 
 [Fonts]
-fixed="Cantarell,11,-1,5,50,0,0,0,0,0,Regular"
-general="Cantarell,11,-1,5,50,0,0,0,0,0,Regular"
+fixed="Cantarell,11,-1,5,50,0,0,0,0,0"
+general="Cantarell,11,-1,5,50,0,0,0,0,0"
 
 [Interface]
 activate_item_on_single_click=1
diff --git a/dotfiles/system/.profile.d/display.sh b/dotfiles/system/.profile.d/display.sh
index b3a99ef..e539ebd 100644
--- a/dotfiles/system/.profile.d/display.sh
+++ b/dotfiles/system/.profile.d/display.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 # display.sh
 # Craig Jennings <c@cjennings.net>
 # UI Appearance settings, sourced by .profile
@@ -7,6 +6,5 @@
 # Theme
 export GTK_THEME=Adwaita:dark
 
-
 export QT_QPA_PLATFORMTHEME=qt5ct
 export QT_SCALE_FACTOR=1