git decided to be funky, removed all merge comments
This commit is contained in:
Cameron Miller
parent
f1900fa748
commit
44e07a2b93
24
README.org
24
README.org
|
|
@ -159,17 +159,14 @@ addrepos() { \
|
|||
echo "####################################################"
|
||||
echo "## Adding the CBSH repository to /etc/pacman.conf ##"
|
||||
echo "####################################################"
|
||||
grep -qxF "[cbsh-arch-repo]" /etc/pacman.conf ||
|
||||
<<<<<<< HEAD
|
||||
(echo "[cbsh-arch-repo]"; echo "SigLevel = Optional DatabaseOptional"; \
|
||||
=======
|
||||
(echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
echo "Server = https://gitlab.com/cbsh/cbsh-arch/\$repo/-/raw/main/\$arch") | sudo tee -a /etc/pacman.conf
|
||||
grep -qxF "[cbsh-arch-repo]" /etc/pacman.conf || (echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
|
||||
echo "Server = https://gitlab.com/cbsh/cbsh-arch/\$repo/-/raw/main/\$arch") | sudo tee -a /etc/pacman.conf
|
||||
}
|
||||
addrepos || err "Error adding the Repo to /etc/pacman.conf."
|
||||
#+end_src
|
||||
|
||||
#+RESULTS:
|
||||
|
||||
|
||||
* Adding keyservers to gpg.conf
|
||||
#+begin_src bash
|
||||
|
|
@ -208,15 +205,9 @@ 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.
|
||||
<<<<<<< HEAD
|
||||
pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code librewolf-bin
|
||||
=======
|
||||
pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
#+end_src
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
* Choosing Graphics Drivers
|
||||
By Default, the script normally installed the Nvidia Drivers, due to me using a Nvidia GPU, but recently i've realised it would be a much better idea to allow the user to install the relevant drivers based on what they use (Intel HD/Iris/Xe Graphics, AMD Graphics, Nvidia Graphics) instead of just installing the Nvidia Drivers if they don't use a Nvidia card.
|
||||
#+begin_src bash
|
||||
|
|
@ -257,8 +248,6 @@ select choice in "${shells[@]}"; do
|
|||
done
|
||||
#+end_src
|
||||
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
* Copying over the configs from /etc/cbsh to $HOME
|
||||
Pacman cannot install files to $HOME, so normally we would place them in /etc/skel, but as some distros such as Manjaro and Arco use /etc/skel for their own specific config files, we place them in /etc/cbsh so there are no conflicts on any arch based distro. the config files are placed here and then copied over to $HOME, we backup config just in case anything goes wrong. BEWARE!
|
||||
|
||||
|
|
@ -276,11 +265,8 @@ echo "#########################################################"
|
|||
[ -d ~/.config ] && mkdir ~/.config-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M)
|
||||
|
||||
cd /etc/cbsh
|
||||
<<<<<<< HEAD
|
||||
sudo mv .config/qtile/* .config/qtile
|
||||
sudo mv .config/kitty/* .config/kitty
|
||||
=======
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
sudo mv zsh/.zshrc .zshrc
|
||||
cp -Rf . ~ && cd -
|
||||
|
||||
|
|
@ -338,14 +324,12 @@ 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.
|
||||
<<<<<<< HEAD
|
||||
echo "######################################################"
|
||||
echo "## Disable previous login manager, if there is one. ##"
|
||||
echo "######################################################"
|
||||
sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager, or a Display Manager isn't already installed."
|
||||
=======
|
||||
sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager, or one is not installed."
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
|
||||
# Then enable SDDM as the Login Manager
|
||||
sudo systemctl enable sddm
|
||||
|
|
|
|||
33
cbsh
33
cbsh
|
|
@ -41,17 +41,8 @@ addrepos() { \
|
|||
echo "####################################################"
|
||||
echo "## Adding the CBSH repository to /etc/pacman.conf ##"
|
||||
echo "####################################################"
|
||||
grep -qxF "[cbsh-arch-repo]" /etc/pacman.conf ||
|
||||
<<<<<<< Updated upstream
|
||||
<<<<<<< HEAD
|
||||
(echo "[cbsh-arch-repo]"; echo "SigLevel = Optional DatabaseOptional"; \
|
||||
=======
|
||||
(echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
=======
|
||||
(echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
|
||||
>>>>>>> Stashed changes
|
||||
echo "Server = https://gitlab.com/cbsh/cbsh-arch/\$repo/-/raw/main/\$arch") | sudo tee -a /etc/pacman.conf
|
||||
grep -qxF "[cbsh-arch-repo]" /etc/pacman.conf || (echo "[cbsh-arch-repo]"; echo "SigLevel = Required DatabaseOptional"; \
|
||||
echo "Server = https://gitlab.com/cbsh/cbsh-arch/\$repo/-/raw/main/\$arch") | sudo tee -a /etc/pacman.conf
|
||||
}
|
||||
addrepos || err "Error adding the Repo to /etc/pacman.conf."
|
||||
|
||||
|
|
@ -78,14 +69,7 @@ recieve_keys || err "Error Recieving PGP key $_pgpkey"
|
|||
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.
|
||||
<<<<<<< Updated upstream
|
||||
<<<<<<< HEAD
|
||||
pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code librewolf-bin
|
||||
=======
|
||||
pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
=======
|
||||
pikaur -Syu nerd-fonts-source-code-pro nerd-fonts-fira-code
|
||||
|
||||
PS3='Set Graphics Drivers: \n
|
||||
NOTE: Currently, the nvidia-open drivers have an issue where they do not work on systems with AMD APUs, such as the Laptop Ryzen chips (C/U/H/HS/HX), or the Ryzen 2/3/4/5000 Series G Families of chips on the desktop, please use the closed source drivers instead to make sure you have a working system.'
|
||||
|
|
@ -122,7 +106,6 @@ select choice in "${shells[@]}"; do
|
|||
;;
|
||||
esac
|
||||
done
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
echo "#########################################################"
|
||||
echo "## Copying the config files from /etc/cbsh into \$HOME ##"
|
||||
|
|
@ -133,14 +116,8 @@ echo "#########################################################"
|
|||
[ -d ~/.config ] && mkdir ~/.config-backup-$(date +%Y.%m.%d-%H%M) && cp -Rf ~/.config ~/.config-backup-$(date +%Y.%m.%d-%H%M)
|
||||
|
||||
cd /etc/cbsh
|
||||
<<<<<<< Updated upstream
|
||||
<<<<<<< HEAD
|
||||
sudo mv .config/qtile/* .config/qtile
|
||||
sudo mv .config/kitty/* .config/kitty
|
||||
=======
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
sudo mv zsh/.zshrc .zshrc
|
||||
cp -Rf . ~ && cd -
|
||||
|
||||
|
|
@ -186,18 +163,12 @@ select choice in "${shells[@]}"; do
|
|||
done
|
||||
|
||||
# Disable Current Login Manager, if any.
|
||||
<<<<<<< Updated upstream
|
||||
<<<<<<< HEAD
|
||||
echo "######################################################"
|
||||
echo "## Disable previous login manager, if there is one. ##"
|
||||
echo "######################################################"
|
||||
sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager, or a Display Manager isn't already installed."
|
||||
=======
|
||||
sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager, or one is not installed."
|
||||
>>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
|
||||
=======
|
||||
sudo systemctl disable $(grep '/usr/s\?bin' /etc/systemd/system/display-manager.service | awk -F / '{print $NF}') || echo "Cannot Disable current Display Manager, or one is not installed."
|
||||
>>>>>>> Stashed changes
|
||||
|
||||
# Then enable SDDM as the Login Manager
|
||||
sudo systemctl enable sddm
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user