fixing gdm install

2 files changed, 74 insertions, 71 deletions

diff --git a/archsetup b/archsetup
index d88ab4d..4bef5cb 100755
--- a/archsetup
+++ b/archsetup
@@ -31,7 +31,7 @@ dotemacs_repo="https://git.cjennings.net/dotemacs.git"
 dotfiles_home="/home/$username/.dotfiles"
 
 logfile="/var/log/archsetup-$(date +'%Y-%m-%d-%H-%M-%S').log"
-source_dir="/home/$username/.local/src" # aur/git source goes here
+source_dir="/home/$username/.local/src" # aur/git source directory
 packages_before="/var/log/archsetup-preexisting-package-list.txt"
 packages_after="/var/log/archsetup-post-install-package-list.txt"
 archsetup_packages="/var/log/archsetup-installed-packages.txt"
@@ -188,8 +188,8 @@ prerequisites() {
     display "subtitle" "Required Software"
 
     for software in linux-firmware base-devel ca-certificates \
-                    coreutils curl git go ntp openssh python \
-                    stow tar vi zsh; do
+                                   coreutils curl git go ntp openssh python \
+                                   stow tar vi zsh; do
         pacman_install "$software"
     done
 
@@ -393,11 +393,11 @@ essential_services() {
     action="configuring ufw to deny by default" && display "task" "$action"
     ufw default deny incoming >> "$logfile" 2>&1 || error "error" "$action"
 
-	# note on the numbered protocols
-	#   "80,443,8080/tcp"                   ## http and https traffic
-	#   "9040,9050,9051,9053,9119/tcp"      ## tor network
-	#   "55353/udp"                         ## DNS
-	#   "22000/tcp" "22000/udp" "21027/udp" ## syncthing
+    # note on the numbered protocols
+    #   "80,443,8080/tcp"                   ## http and https traffic
+    #   "9040,9050,9051,9053,9119/tcp"      ## tor network
+    #   "55353/udp"                         ## DNS
+    #   "22000/tcp" "22000/udp" "21027/udp" ## syncthing
 
     for protocol in \
         "80,443,8080/tcp" \
@@ -425,9 +425,9 @@ essential_services() {
 
     # Service Discovery
 
-	display "subtitle" "Network Service Discovery"
-	pacman_install nss-mdns # GNU Name Service Switch host name resolution
-	pacman_install avahi # service discovery on a local network using mdns
+    display "subtitle" "Network Service Discovery"
+    pacman_install nss-mdns # GNU Name Service Switch host name resolution
+    pacman_install avahi # service discovery on a local network using mdns
 
     action="configuring avahi" && display "task" "$action"
     systemctl disable systemd-resolved.service >> "$logfile" 2>&1 || error "error" "$action" "$?"
@@ -507,19 +507,19 @@ dwm() {
 desktop_environment() {
     display "title" "Desktop Environment"
 
-	# Fonts
+    # Fonts
 
-	action="Fonts" && display "subtitle" "$action"
-	pacman_install noto-fonts-emoji
-	pacman_install ttf-firacode-nerd
-	pacman_install ttf-hack-nerd
-	pacman_install ttf-jetbrains-mono-nerd
-	pacman_install ttf-meslo-nerd
-	pacman_install ttf-nerd-fonts-symbols-mono
-	aur_install ttf-all-the-icons
-	aur_install ttf-lato
-	aur_install ttf-ms-fonts
-	aur_install ttf-ubraille
+    action="Fonts" && display "subtitle" "$action"
+    pacman_install noto-fonts-emoji
+    pacman_install ttf-firacode-nerd
+    pacman_install ttf-hack-nerd
+    pacman_install ttf-jetbrains-mono-nerd
+    pacman_install ttf-meslo-nerd
+    pacman_install ttf-nerd-fonts-symbols-mono
+    aur_install ttf-all-the-icons
+    aur_install ttf-lato
+    aur_install ttf-ms-fonts
+    aur_install ttf-ubraille
 
 
     # System Utilities
@@ -603,17 +603,17 @@ desktop_environment() {
         pacman_install "$software"
     done;
 
-	for software in task-spooler speedtest-go-bin gotop-bin rar; do
+    for software in task-spooler speedtest-go-bin gotop-bin rar; do
         aur_install "$software"
     done;
 
     # Help And Documentation
 
-	action="Help and Documentation" && display "subtitle" "$action"
-	pacman_install man
-	pacman_install arch-wiki-docs
-	pacman_install tealdeer
-	aur_install cht.sh-git
+    action="Help and Documentation" && display "subtitle" "$action"
+    pacman_install man
+    pacman_install arch-wiki-docs
+    pacman_install tealdeer
+    aur_install cht.sh-git
 
     # Sync Services
 
@@ -626,14 +626,14 @@ desktop_environment() {
 
     action="Desktop Environment Utilities" && display "subtitle" "$action"
 
-	for software in brightnessctl xautolock network-manager-applet xclip \
+    for software in brightnessctl xautolock network-manager-applet xclip \
                                   conky nitrogen qalculate-gtk; do
         pacman_install $software
     done;
 
     aur_install python-pulsectl
     aur_install caffeine-ng
-	aur_install colorpicker
+    aur_install colorpicker
 
     # Theme and Cursor
 
@@ -652,22 +652,22 @@ desktop_environment() {
 
     action="Browsers" && display "subtitle" "$action"
     pacman_install firefox
-	## TESTING IF NEEDED aur_install librewolf-bin
+    ## TESTING IF NEEDED aur_install librewolf-bin
     aur_install tor-browser-bin
     aur_install google-chrome
 
     # Install Printing
 
     action="Print System" && display "subtitle" "$action"
-	pacman_install cups                        # the printing service
-	pacman_install cups-pdf                    # allows printing to pdf
-	pacman_install foomatic-db-engine          # generates printer drivers, queues, and jobs
-	pacman_install foomatic-db-ppds            # printer driver descriptions
-	pacman_install foomatic-db-nonfree-ppds    # non-free printer driver descriptions
-	pacman_install gutenprint                  # printer driver engine for older computers
-	pacman_install foomatic-db-gutenprint-ppds # gutenprint prebuilt ppd files
-
-	action="enabling printing service to launch at boot" && display "task" "$action"
+    pacman_install cups                        # the printing service
+    pacman_install cups-pdf                    # allows printing to pdf
+    pacman_install foomatic-db-engine          # generates printer drivers, queues, and jobs
+    pacman_install foomatic-db-ppds            # printer driver descriptions
+    pacman_install foomatic-db-nonfree-ppds    # non-free printer driver descriptions
+    pacman_install gutenprint                  # printer driver engine for older computers
+    pacman_install foomatic-db-gutenprint-ppds # gutenprint prebuilt ppd files
+
+    action="enabling printing service to launch at boot" && display "task" "$action"
     (systemctl enable cups.service  >> "$logfile" 2>&1) || error "error" "$action" "$?"
 }
 
@@ -697,8 +697,8 @@ developer_workstation () {
     pacman_install rust        # Rust programming language
 
     # Python
-	pacman_install pyright     # Python language server
-	pacman_install pyenv       # Python environment manager
+    pacman_install pyright     # Python language server
+    pacman_install pyenv       # Python environment manager
 
     # Shell
     pacman_install shellcheck  # Shell script linter
@@ -711,11 +711,11 @@ developer_workstation () {
     pacman_install staticcheck # Go programming language linter
 
     # Typescript
-	pacman_install jq          # JSON processor
-	pacman_install typescript  # Typescript programming language
-	pacman_install nodejs      # Node-js JavaScript runtime environment
-	pacman_install npm         # Node-js package manager
-	aur_install nvm            # Node-js version manager
+    pacman_install jq          # JSON processor
+    pacman_install typescript  # Typescript programming language
+    pacman_install nodejs      # Node-js JavaScript runtime environment
+    pacman_install npm         # Node-js package manager
+    aur_install nvm            # Node-js version manager
 
     # HTML
     pacman_install tidy        # HTML formatter
@@ -736,7 +736,7 @@ developer_workstation () {
     pacman_install emacs
 
     # supporting utilities used by my emacs configuration
-	aur_install exercism-bin         # command line tool for exercism.io
+    aur_install exercism-bin         # command line tool for exercism.io
     aur_install isync                # email sync
     aur_install mu                   # email indexer and utilities
     aur_install multimarkdown        # markdown conversion
@@ -782,23 +782,23 @@ developer_workstation () {
     pacman_install gnome-boxes
 
     # virtualbox related
-	# ensure headers exist before installing virtualbox*dkms
-	pacman_install linux-headers
-	pacman_install linux-lts-headers
+    # ensure headers exist before installing virtualbox*dkms
+    pacman_install linux-headers
+    pacman_install linux-lts-headers
 
-	pacman_install virtualbox
-	pacman_install virtualbox-guest-iso
-	pacman_install virtualbox-host-dkms
+    pacman_install virtualbox
+    pacman_install virtualbox-guest-iso
+    pacman_install virtualbox-host-dkms
 
     # docker
-	action="adding user to vboxusers group" && display "task" "$action"
-	(gpasswd -a $username vboxusers >> "$logfile" 2>&1)  || error "error" "$action" "$?"
-	pacman_install docker
-	pacman_install docker-compose
-	action="adding user to docker group" && display "task" "$action"
-	(gpasswd -a $username docker >> "$logfile" 2>&1)  || error "error" "$action" "$?"
-	action="enabling docker service to launch on boot" && display "task" "$action"
-	systemctl enable docker.service >> "$logfile" 2>&1  || error "error" "$action" "$?"
+    action="adding user to vboxusers group" && display "task" "$action"
+    (gpasswd -a $username vboxusers >> "$logfile" 2>&1)  || error "error" "$action" "$?"
+    pacman_install docker
+    pacman_install docker-compose
+    action="adding user to docker group" && display "task" "$action"
+    (gpasswd -a $username docker >> "$logfile" 2>&1)  || error "error" "$action" "$?"
+    action="enabling docker service to launch on boot" && display "task" "$action"
+    systemctl enable docker.service >> "$logfile" 2>&1  || error "error" "$action" "$?"
 }
 
 ### Supplemental Software
@@ -917,11 +917,11 @@ boot_ux() {
 
     # action="removing hostname from login prompt" && display "task" "$action"
     # sed -i "s/--noclear/--nohostname --noclear/g" /usr/lib/systemd/system/getty@.service  \
-    #     || error "error" "$action" "$?"
+        #     || error "error" "$action" "$?"
     # sed -i "s/--noclear/--nohostname --noclear/g" /usr/lib/systemd/system/container-getty@.service  \
-    #     || error "error" "$action" "$?"
+        #     || error "error" "$action" "$?"
     # sed -i "s/--noclear/--nohostname --noclear/g" /usr/lib/systemd/system/console-getty.service  \
-    #     || error "error" "$action" "$?"
+        #     || error "error" "$action" "$?"
 
     action="silencing the unneeded and chatty watchdog module" && display "task" "$action"
     echo "blacklist iTCO_wdt" >/etc/modprobe.d/nowatchdog.conf  || error "error" "$action" "$?"
@@ -942,11 +942,12 @@ boot_ux() {
     # GDM
     action="installing login manager and dependencies" && display "task" "$action"
     pacman_install gdm
+    action="enabling login manager service" && display "task" "$action"
     (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
+    # Create DWM Entry for GDM
+    cat << EOF > /usr/share/xsessions/dwm.desktop
 [Desktop Entry]
 Encoding=UTF-8
 Name=dwm
@@ -956,7 +957,6 @@ Icon=dwm
 Type=XSession
 EOF
 
-
 }
 
 
diff --git a/init b/init
index 8d44b49..3c03437 100755
--- a/init
+++ b/init
@@ -2,7 +2,10 @@
 
 # init
 # Craig Jennings <c@cjennings.net>
-# An archsetup script to welcome user, present options, and setup ssh
+# The initial archsetup script. Downloads and calls other scripts.
+
+
+# welcome user, present options, and setup ssh
 # server from the live cd. Functions to installing base arch and setup
 # the workstation occur in other scripts, called by this script.