From 718921781fe3eb515555810a8800705e1dcc9a20 Mon Sep 17 00:00:00 2001
From: Cameron Miller <cameron@codecameron.dev>
Date: Fri, 3 Dec 2021 14:07:35 +0000
Subject: [PATCH] Remove unneeded directories from config files in /etc/cbsh,
 do some code cleanup

---
 README.org   | 23 ++++++++++++++++-------
 cbsh_arch.sh | 17 ++++++++++++-----
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/README.org b/README.org
index 37de1ef..567b5a3 100644
--- a/README.org
+++ b/README.org
@@ -24,6 +24,7 @@
 - [[#copying-over-the-configs-from-etccbsh-to-home][Copying over the configs from /etc/cbsh to $HOME]]
 - [[#installing-doom-emacs][Installing DOOM Emacs!]]
 - [[#the-fun-part-setting-the-default-user-shell][The Fun part, Setting the default USER shell!]]
+- [[#make-sure-sddm-is-enabled-so-we-dont-boot-into-a-tty-and-networkmanager-is-too-so-the-applet-works][Make Sure SDDM is enabled so we don't boot into a TTY, and NetworkManager is too so the applet works.]]
 - [[#installation-complete][Installation Complete!]]
 
 * About CBSH
@@ -171,7 +172,7 @@ All packages listed are either in the standard Arch Repos or in my CBSH repos. t
 sudo pacman --needed --ask 4 -Syu - < pkglist.txt
 
 # Now that pikaur is installed, we can sync the AUR and install some needed packages (Nerd Fonts) from there.
-pikaur -S nerd-fonts-source-code-pro nerd-fonts-fira-code pa-applet
+pikaur -S nerd-fonts-source-code-pro nerd-fonts-fira-code pa-applet-git
 #+end_src
 
 * Copying over the configs from /etc/cbsh to $HOME
@@ -186,13 +187,15 @@ echo "#########################################################"
 [ ! -d /etc/cbsh ] && sudo mkdir /etc/cbsh
 [ -d /etc/cbsh ] && mkdir ~/cbsh-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf /etc/cbsh ~/cbsh-backup-$(date +%Y.%m.%d-%H%M)
 [ ! -d ~/.config ] && mkdir ~/.config
-[ -d ~/.config ] && mkdir ~/.config-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M)
-cd /etc/cbsh && sudo mv .config/qtile/qtile/* .config/qtile && sudo rm -r .config/qtile/qtile && cp -Rf . ~ && cd -
-#+end_src
+[ -d ~/.config ] && mkdir ~/.config-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M)
 
-#+begin_src bash
-# Change all scipts in .local/bin to be executable.
-find $HOME/.local/bin -type f -print0 | xargs -0 chmod 775
+cd /etc/cbsh
+sudo mv .config/qtile/qtile/* .config/qtile && sudo rm -r .config/qtile/qtile
+sudo mv .config/alacritty/alacritty/* .config/alacritty && sudo rm -r .config/alacritty/alacritty
+sudo mv .config/kitty/kitty/* .config/kitty && sudo rm -r .config/kitty/kitty
+sudo mv .config/zsh/.zshrc .zshrc && sudo rm -r .config/zsh
+sudo mv .doom.d/* .config/doom && sudo rm -r .config/zsh
+cp -Rf . ~ && cd -
 #+end_src
 
 
@@ -232,6 +235,12 @@ select choice in "${shells[@]}"; do
     done
 #+end_src
 
+* Make Sure SDDM is enabled so we don't boot into a TTY, and NetworkManager is too so the applet works.
+#+begin_src bash
+sudo systemctl enable sddm
+sudo systemctl enable NetworkManager
+#+end_src
+
 * Installation Complete!
 #+begin_src bash
 echo "###########################################"
diff --git a/cbsh_arch.sh b/cbsh_arch.sh
index 72828a5..1a490e3 100755
--- a/cbsh_arch.sh
+++ b/cbsh_arch.sh
@@ -60,7 +60,7 @@ addkeyservers || err "Error adding the Keyservers to /etc/pacman.d/gnupg/gpg.con
 sudo pacman --needed --ask 4 -Syu - < pkglist.txt
 
 # Now that pikaur is installed, we can sync the AUR and install some needed packages (Nerd Fonts) from there.
-pikaur -S nerd-fonts-source-code-pro nerd-fonts-fira-code pa-applet
+pikaur -S nerd-fonts-source-code-pro nerd-fonts-fira-code pa-applet-git
 
 echo "#########################################################"
 echo "## Copying the config files from /etc/cbsh into \$HOME ##"
@@ -68,11 +68,15 @@ echo "#########################################################"
 [ ! -d /etc/cbsh ] && sudo mkdir /etc/cbsh
 [ -d /etc/cbsh ] && mkdir ~/cbsh-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf /etc/cbsh ~/cbsh-backup-$(date +%Y.%m.%d-%H%M)
 [ ! -d ~/.config ] && mkdir ~/.config
-[ -d ~/.config ] && mkdir ~/.config-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M)
-cd /etc/cbsh && sudo mv .config/qtile/qtile/* .config/qtile && sudo rm -r .config/qtile/qtile && cp -Rf . ~ && cd -
+[ -d ~/.config ] && mkdir ~/.config-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M)
 
-# Change all scipts in .local/bin to be executable.
-find $HOME/.local/bin -type f -print0 | xargs -0 chmod 775
+cd /etc/cbsh
+sudo mv .config/qtile/qtile/* .config/qtile && sudo rm -r .config/qtile/qtile
+sudo mv .config/alacritty/alacritty/* .config/alacritty && sudo rm -r .config/alacritty/alacritty
+sudo mv .config/kitty/kitty/* .config/kitty && sudo rm -r .config/kitty/kitty
+sudo mv .config/zsh/.zshrc .zshrc && sudo rm -r .config/zsh
+sudo mv .doom.d/* .config/doom && sudo rm -r .config/zsh
+cp -Rf . ~ && cd -
 
 echo "#########################################################"
 echo "## Installing Doom Emacs. This may take a few minutes. ##"
@@ -103,6 +107,9 @@ select choice in "${shells[@]}"; do
         esac
     done
 
+sudo systemctl enable sddm
+sudo systemctl enable NetworkManager
+
 echo "###########################################"
 echo "## CBSH has been installed successfully! ##"
 echo "###########################################"