From 638d654fd78532f4a1e83fa9c66257888e5a1cd1 Mon Sep 17 00:00:00 2001 From: Cameron Miller Date: Thu, 9 Dec 2021 13:09:54 +0000 Subject: [PATCH] Update Readme and script --- README.org | 41 +++++++++++++++++++++++++++++++++++++++-- cbsh_arch.sh | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/README.org b/README.org index 4904012..7af6610 100644 --- a/README.org +++ b/README.org @@ -20,6 +20,7 @@ - [[#the-welcome-message][The Welcome Message]] - [[#adding-the-cbsh-repos-to-your-system][Adding the CBSH Repos to your system.]] - [[#adding-keyservers-to-gpgconf][Adding keyservers to gpg.conf]] +- [[#recieving-the-pgp-key][Recieving the PGP key]] - [[#installing-the-packages-from-the-repos][Installing the packages from the repos]] - [[#copying-over-the-configs-from-etccbsh-to-home][Copying over the configs from /etc/cbsh to $HOME]] - [[#installing-doom-emacs][Installing DOOM Emacs!]] @@ -162,6 +163,19 @@ addkeyservers || err "Error adding the Keyservers to /etc/pacman.d/gnupg/gpg.con #+end_src +* Recieving the PGP key +#+begin_src bash +recieve_keys() { \ + local _pgpkey="94424B71F1A63D9D" + echo "#############################" + echo "## Adding PGP key $_pgpkey ##" + echo "#############################" + sudo pacman-key --recv-key $_pgpkey + sudo pacman-key --lsign-key $_pgpkey +} +recieve_keys || err "Error Recieving PGP key $_pgpkey" +#+end_src + * Installing the packages from the repos All packages listed are either in the standard Arch Repos or in my CBSH repos. these will all get installed with pacman. the only exception is DOOM Emacs which will be installed later in the script. @@ -191,10 +205,8 @@ echo "#########################################################" 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 @@ -237,7 +249,32 @@ select choice in "${shells[@]}"; do * Make Sure SDDM is enabled so we don't boot into a TTY, and NetworkManager is too so the applet works. #+begin_src bash +# Disable Current Login Manager, if any. +sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager" + +# Then enable SDDM as the Login Manager sudo systemctl enable sddm +echo "###################################" +echo "## Enable sddm as login manager. ##" +echo "###################################" + +## Next, Set cbsh-sddm-theme as the default theme for SDDM ## +# System Configuration File +[ -f "/usr/lib/sddm/sddm.conf.d/default.conf" ] && \ + sudo cp /usr/lib/sddm/sddm.conf.d/default.conf /usr/lib/sddm/sddm.conf.d/default.conf.backup && \ + sudo sed -i 's/^Current=*.*/Current=cbsh-sddm-theme/g' /usr/lib/sddm/sddm.conf.d/default.conf + +# Local SDDM Configuration File +[ -f "/etc/sddm.conf" ] && \ + sudo cp /etc/sddm.conf /etc/sddm.conf.backup && \ + sudo sed -i 's/^Current=*.*/Current=cbsh-sddm-theme/g' /etc/sddm.conf + +# Create a local file if it doesnt exist (Mainline Arch Linux doesn't by default) +[ ! -f "/etc/sddm.conf" ] && \ + sudo cp /usr/lib/sddm/sddm.conf.d/default.conf /etc/sddm.conf || echo "Default sddm system config file is not found." + + +# Enable NetworkManager for networking sudo systemctl enable NetworkManager #+end_src diff --git a/cbsh_arch.sh b/cbsh_arch.sh index 8563ac9..52c1961 100755 --- a/cbsh_arch.sh +++ b/cbsh_arch.sh @@ -56,6 +56,16 @@ addkeyservers() { \ } addkeyservers || err "Error adding the Keyservers to /etc/pacman.d/gnupg/gpg.conf" +recieve_keys() { \ + local _pgpkey="94424B71F1A63D9D" + echo "#############################" + echo "## Adding PGP key $_pgpkey ##" + echo "#############################" + sudo pacman-key --recv-key $_pgpkey + sudo pacman-key --lsign-key $_pgpkey +} +recieve_keys || err "Error Recieving PGP key $_pgpkey" + # Let's install all of the packages listed in the pkglist.txt file. sudo pacman --needed --ask 4 -Syu - < pkglist.txt @@ -72,10 +82,8 @@ echo "#########################################################" 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 "#########################################################" @@ -107,7 +115,32 @@ select choice in "${shells[@]}"; do esac done +# Disable Current Login Manager, if any. +sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager" + +# Then enable SDDM as the Login Manager sudo systemctl enable sddm +echo "###################################" +echo "## Enable sddm as login manager. ##" +echo "###################################" + +## Next, Set cbsh-sddm-theme as the default theme for SDDM ## +# System Configuration File +[ -f "/usr/lib/sddm/sddm.conf.d/default.conf" ] && \ + sudo cp /usr/lib/sddm/sddm.conf.d/default.conf /usr/lib/sddm/sddm.conf.d/default.conf.backup && \ + sudo sed -i 's/^Current=*.*/Current=cbsh-sddm-theme/g' /usr/lib/sddm/sddm.conf.d/default.conf + +# Local SDDM Configuration File +[ -f "/etc/sddm.conf" ] && \ + sudo cp /etc/sddm.conf /etc/sddm.conf.backup && \ + sudo sed -i 's/^Current=*.*/Current=cbsh-sddm-theme/g' /etc/sddm.conf + +# Create a local file if it doesnt exist (Mainline Arch Linux doesn't by default) +[ ! -f "/etc/sddm.conf" ] && \ + sudo cp /usr/lib/sddm/sddm.conf.d/default.conf /etc/sddm.conf || echo "Default sddm system config file is not found." + + +# Enable NetworkManager for networking sudo systemctl enable NetworkManager echo "###########################################"