fixed typo in bashrc path, variabilized bashrc path

excluded fancyfy from source in for loop
added sourcing only the correct file

README.md

@@ -1,4 +1,10 @@
-# personal-kde-config
-Personal KDE and other Linux-related configs to help me succeed in life (or at least simplify it).
+# Personal Linux config
+Personal Linux-related configs to help me succeed in life (or at least simplify it).
 
-Feel free to try this out, or even add "cool stuff" to help each other out!
+Feel free to try or poke around in the source (it's all human-readable bash), or heck even add "cool stuff" to help each other out!
+
+## Usage
+Explaining section for not-so-intuitive configurations
+
+- alias `sambaserver`: please `cd` into the directoy is needed to be shared and execute `sambaserver` followed by `"shareuser;<SUBSTITUTE-YOUR-PASSWORD-HERE>"`, then just login with username `shareuser` and the provided password with the host computer as URL/IP, autodiscovery of both the host and the share was tested working on Windows and a Samsung Tablet.
+- alias `termbin`: use when piping a cat/echo/file/etc to upload to termbin.com (¡requires Netcat!)

bashrc_overrides/_all

@@ -1,5 +1,4 @@
-for source in colored_commands convenience_aliases git_functions histcontrol ls_aliases safety_aliases terminal_colors terminal_fancyfying; do
-  if [ -f ~/.bashrc_overrides/$source ]; then
-    . ~/.bashrc_overrides/$source
-  fi
+for source in $(find "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" -type f | grep -Ev "_all|terminal_fancyfying"); do
+  . "${source}"
 done
+. "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)/terminal_fancyfying_${TERMINAL_FANCYFY}"

bashrc_overrides/convenience_aliases

@@ -1,3 +1,15 @@
-alias pubkey='cat ~/.ssh/id_rsa.pub'
+alias pubkey='for PUBKEY_FILE in $(ls ~/.ssh/id_*.pub); do echo "${PUBKEY_FILE} :" | sed -e "s/.*id_//;s/\.pub//"; cat "${PUBKEY_FILE}"; echo; done'
 alias hosts='sudo nano /etc/hosts'
 alias historygrep='history | grep'
+alias sshconfig='nano ~/.ssh/config'
+alias bashrc='. ~/.bashrc'
+alias sshagent='eval `ssh-agent` && ssh-add ~/.ssh/id_!(*.pub)'
+alias sshfingerprint='ssh-keygen -lf'
+alias nocomments='grep -vE "^$|^#|^;"'
+alias newrepo='bash <(curl -s https://get.bjphoster.com/new-git-repo.sh)'
+alias newansibleworkspace='bash <(curl -s https://get.bjphoster.com/new-ansible-workspace.sh)'
+
+alias sambaserver='docker run -it --rm --network host -p 137:137 -p 138:138 -p 139:139 -p 445:445 -v `pwd`:/share dperson/samba -n -p -s "sambashare;/share;yes;no;no;shareuser" -w "WORKGROUP"'
+alias acme.sh='docker run -it --rm -v ~/acme.sh:/acme.sh neilpang/acme.sh'
+alias termbin='nc termbin.com 9999'
+alias dnsversion='dig txt chaos version.bind'

bashrc_overrides/docker_aliases

@@ -0,0 +1,9 @@
+alias dockerpull='docker compose pull'
+alias dockerup='docker compose up'
+alias dockerupd='docker compose up -d'
+alias dockerdown='docker compose down'
+alias dockerdownv='docker compose down --volumes'
+alias dockerlogs='docker compose logs'
+alias dockerlogsf='docker compose logs --follow'
+alias dockerlogst='docker compose logs --tail=10'
+alias dockerlogstf='docker compose logs --tail=10 --follow'

bashrc_overrides/home_bin_folder

@@ -0,0 +1,4 @@
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi

bashrc_overrides/terminal_fancyfying_client

@@ -13,4 +13,4 @@ if [ $GIT_FUNCTIONS ]; then
 fi
 
 #PS1="$PS1${RED}#${FORMAT_RESET}"
-PS1="$PS1${RED}${FORMAT_BLINK}\$${FORMAT_RESET}"
+PS1="$PS1${RED}\$${FORMAT_RESET}"

bashrc_overrides/terminal_fancyfying_server

@@ -0,0 +1,13 @@
+GIT_FUNCTIONS=true
+
+# Spaced
+#PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
+# Not spaced
+PS1="${LIGHTBLUE}[${LIGHTRED}\u${LIGHTBLUE}@${LIGHTBROWN}$(hostname --fqdn)${LIGHTBLUE}]${LIGHTPURPLE}(${GREEN}\w${LIGHTPURPLE})"
+
+if [ $GIT_FUNCTIONS ]; then
+  #PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
+  PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
+fi
+
+PS1="$PS1${RED}#${FORMAT_RESET}"

deploy.sh

@@ -1,12 +1,33 @@
 #!/usr/bin/env bash
 
 THIS="$(dirname "$(readlink -fm "$0")")"
-CLEANUP=true
+FANCYFY="client"
+CURRENT_FANCYFY=""
+DELETE=false
+MOVE=false
+PRESENT=false
+BASHRC="~/.bashrc"
+
+_bashrc_present() {
+  if [ ! -z "$(grep "#REF:bashrc_overrides:REF" ${BASHRC})" ]; then
+    echo true
+    exit
+  fi
+  echo false
+}
 
 _arguments() {
+  if [ "$(_bashrc_present)" = true ]; then
+    PRESENT=true
+    CURRENT_FANCYFY="$(grep TERMINAL_FANCYFY ${BASHRC} | sed 's/.*=//')"
+  fi
   for PARM in "$@"; do
-    if [ "${PARM}" = "--no-cleanup" ]; then
-      CLEANUP=false
+    if [ "${PARM}" = "--server" ]; then
+      FANCYFY="server"
+    elif [ "${PARM}" = "--delete" ]; then
+      DELETE=true
+    elif [ "${PARM}" = "--move" ]; then
+      MOVE=true
     elif [ "${PARM}" = "-h" ] || [ "${PARM}" = "--help" ]; then
       _help
       exit 0
@@ -15,44 +36,70 @@ _arguments() {
 }
 
 _help() {
-  echo "Usage: $(readlink -fm "$0") [-h | --help] [--no-cleanup]"
+  echo "Usage: $(readlink -fm "$0") [-h | --help] [--cleanup]"
   echo
   echo "Options:"
-  echo "  -h | --help : Prints this help message and quits"
-  echo "  --no-cleanup: Does not clean the source folder after adding the bash overrides"
+  echo "  -h | --help"
+  echo "    Prints this help message and quits"
+  echo "  --force"
+  echo "    Force the reinstallation of the files"
+  echo "  --delete"
+  echo "    Delete the reference in ${BASHRC}"
+  echo "  --move"
+  echo "    Create a new reference if the location of this folder has been changed"
+  echo "  --server"
+  echo "    Customizes the terminal feel for a server installation"
   echo
 }
 
-_bash_overrides() {
-  cp -r bashrc_overrides ~/.bashrc_overrides
-  echo "#REF:bashrc_overrides:REF" >> ~/.bashrc
-  echo "if [ -f ~/.bashrc_overrides/_all ]; then" >> ~/.bashrc
-  echo "  . ~/.bashrc_overrides/_all" >> ~/.bashrc
-  echo "fi" >> ~/.bashrc
+_delete() {
+  sed -i '/REF:bashrc_overrides:REF/{N;N;d}' "${BASHRC}"
 }
 
-_cleanup() {
-  rm -rf ${THIS}
->>>>>>> master
+_bashrc_ref() {
+  echo "#REF:bashrc_overrides:REF" >> "${BASHRC}"
+  echo "export TERMINAL_FANCYFY=${1}" >> "${BASHRC}"
+  echo ". ${THIS}/bashrc_overrides/_all" >> "${BASHRC}"
+}
+
+_move() {
+  _delete
+  _bashrc_ref "${FANCYFY}"
 }
 
 _main() {
   _arguments "$@"
 
-  if [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ]; then
-    echo "bash overrides already in place"
-    echo "skipping..."
-    echo
+  if [ "${DELETE}" = true ]; then
+    _delete
+    echo "removed custom configs"
+  elif [ "${MOVE}" = true ]; then
+    if [ "${PRESENT}" = false ]; then
+      _bashrc_ref "${FANCYFY}"
+      echo "unable to move to current directory"
+      echo "bash overrides not previously present"
+      echo "adding bash overrides..."
+      echo
+    else
+      _move
+      echo "moved custom config directory to ${THIS}"
+      echo
+    fi
+  elif [ "${PRESENT}" = true ]; then
+    if [ "${CURRENT_FANCYFY}" != "${FANCYFY}" ]; then
+      sed -i "s/TERMINAL_FANCYFY=${CURRENT_FANCYFY}/TERMINAL_FANCYFY=${FANCYFY}/" "${BASHRC}"
+      echo "customized fancyfying"
+      echo
+    else
+      echo "bash overrides already in place"
+      echo "skipping..."
+      echo
+    fi
   else
-    _bash_overrides
+    _bashrc_ref "${FANCYFY}"
     echo "bash overrides added"
     echo
   fi
-
-  if [ "${CLEANUP}" = true ]; then
-    echo "cleaning up..."
-    _cleanup
-  fi
 }
 
 _main "$@"