README.md

@@ -6,22 +6,5 @@ Feel free to try or poke around in the source (it's all human-readable bash), or
 ## Usage
 Explaining section for not-so-intuitive configurations
 
-- alias `sambaserver`: (¡requires Docker!) please `cd` into the directoy is needed to be shared and execute `sambaserver`, then just login with default username `user` and the default password `P4ssw0rd` 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 `sambastop`: (¡requires Docker!) when you're finished, this command stops and removes the samba container.
-- alias `termbin`: (¡requires Netcat!) use when piping a cat/echo/file/etc to upload to termbin.com
-
-## Modular sourcing mechanism
-Create a file in your home directory called `~/.bash_sources`, and put a script path on every line of this file, it will be sourced automatically.<br>
-WARNING: it has to be a full path, for example `/path/to/script.sh` and not abbreviated (as in `~/script.sh`)... idk bash decided like so.<br>
-WARNING 2: every line needs to be a path to a file, not a direct command, sourcing a file is possible; souring an "export" or a function... not so much!
-
-#### For example:
-`/home/user/.bash_sources`:
-```bash
-/home/user/.bash_path
-/path/to/some/other/script.sh
-```
-`/home/user/.bash_path`:
-```bash
-export PATH=~/bin/myproject/bin:$PATH
-```
+- 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,15 +1,13 @@
-# Source all the overrides in this folder
-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}"
-
-# If the file ~/.bash_sources exist, source every line it contains
-if [ -f ~/.bash_sources ]; then
-  while IFS= read -r line; do
-    # Skip empty lines and comments (#)
-    if [ -n "$line" ] && ! [[ "$line" == \#* ]]; then
-      . "$line"
+for source in colored_commands \
+              convenience_aliases \
+              git_functions \
+              histcontrol \
+              home_bin_folder \
+              ls_aliases \
+              safety_aliases \
+              terminal_colors \
+              terminal_fancyfying; do
+  if [ -f ~/.bashrc_overrides/$source ]; then
+    . ~/.bashrc_overrides/$source
   fi
-  done < ~/.bash_sources
-fi
+done

bashrc_overrides/convenience_aliases

@@ -1,18 +1,8 @@
-alias pubkey='for PUBKEY_FILE in $(ls ~/.ssh/id_*.pub); do echo "${PUBKEY_FILE} :" | sed -e "s/.*id_//;s/\.pub//"; cat "${PUBKEY_FILE}"; ssh-keygen -lf "${PUBKEY_FILE}" -E sha256; echo; done'
-alias taglist='git tag | tr - \~ | sort -V | tr \~ -'
+alias pubkey='cat ~/.ssh/id_rsa.pub'
 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 infinitenothing='while true; do sleep 1; done'
 
-alias sambaserver='docker run -dit --rm --name sambaserver -p 137:137 -p 138:138 -p 139:139 -p 445:445 -v `pwd`:/share dperson/samba -n -p -u "user;P4ssw0rd" -s "share;/share;yes;no;yes;user;user" -w "WORKGROUP"'
-alias sambastop='docker stop sambaserver; docker rm sambaserver'
-alias acme.sh='docker run -it --rm -v ~/acme.sh:/acme.sh neilpang/acme.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 termbin='nc termbin.com 9999'
-alias dnsversion='dig txt chaos version.bind'

bashrc_overrides/docker_aliases

@@ -1,9 +0,0 @@
-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/git_functions

@@ -21,16 +21,3 @@ __git_prompt() {
 __git_history() {
   echo "$(git log --oneline | cut -d ' ' -f 1)"
 }
-
-tagpush() {
-  if [ -z "$1" ]; then
-    echo "Usage: tagpush <tag>"
-    return
-  fi
-  git tag "$1"
-  # for every remote
-  for REMOTE in $(git remote) ; do
-    # push current branch and newly created tag
-    git push "$REMOTE" $(git branch | grep "*" | sed 's/\* //') "$1"
-  done
-}

bashrc_overrides/terminal_fancyfying

@@ -1,7 +1,4 @@
-command -v git &>/dev/null
-if [ $? -eq 0 ]; then
-  GIT_FUNCTIONS=true
-fi
+GIT_FUNCTIONS=true
 
 # Spaced
 #PS1="${LIGHTBLUE}[ ${LIGHTRED}\u ${LIGHTBLUE}@ ${LIGHTBROWN}$(hostname --fqdn) ${LIGHTBLUE}] ${LIGHTPURPLE}( ${GREEN}\w ${LIGHTPURPLE}) "
@@ -10,10 +7,10 @@ fi
 # another version I really like
 PS1="${PURPLE}\# ${LIGHTBLUE}{${LIGHTGREEN}\u${BROWN}@${LIGHTGREEN}\$(hostname --fqdn)${LIGHTBLUE}} ${LIGHTPURPLE}[${CYAN}\w${LIGHTPURPLE}] "
 
-if [ $GIT_FUNCTIONS = "true" ]; then
+if [ $GIT_FUNCTIONS ]; then
   #PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
   PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
 fi
 
 #PS1="$PS1${RED}#${FORMAT_RESET}"
-PS1="$PS1${RED}\$${FORMAT_RESET}"
+PS1="$PS1${RED}${FORMAT_BLINK}\$${FORMAT_RESET}"

bashrc_overrides/terminal_fancyfying_server

@@ -1,14 +1,11 @@
-command -v git &>/dev/null
-if [ $? -eq 0 ]; then
-  GIT_FUNCTIONS=true
-fi
+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 = "true" ]; then
+if [ $GIT_FUNCTIONS ]; then
   #PS1="$PS1${LIGHTPURPLE}[${LIGHTCYAN}$(__git_prompt)${LIGHTPURPLE}]"
   PS1="$PS1${LIGHTBROWN}(${LIGHTCYAN}\$(__git_prompt)${LIGHTBROWN}) "
 fi

deploy.sh

@@ -1,28 +1,17 @@
 #!/usr/bin/env bash
 
 THIS="$(dirname "$(readlink -fm "$0")")"
-FANCYFY="client"
-CURRENT_FANCYFY=""
+SERVER=false
+FORCE=false
 DELETE=false
 MOVE=false
-PRESENT=false
-
-_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}" = "--server" ]; then
-      FANCYFY="server"
+      SERVER=true
+    elif [ "${PARM}" = "--force" ]; then
+      FORCE=true
     elif [ "${PARM}" = "--delete" ]; then
       DELETE=true
     elif [ "${PARM}" = "--move" ]; then
@@ -43,7 +32,7 @@ _help() {
   echo "  --force"
   echo "    Force the reinstallation of the files"
   echo "  --delete"
-  echo "    Delete the reference in ${BASHRC}"
+  echo "    Delete the reference in ~/.bashrc"
   echo "  --move"
   echo "    Create a new reference if the location of this folder has been changed"
   echo "  --server"
@@ -52,18 +41,17 @@ _help() {
 }
 
 _delete() {
-  sed -i '/REF:bashrc_overrides:REF/{N;N;d}' ~/.bashrc
+  sed -i '/REF:bashrc_overrides:REF/{N;d}' ~/.bashrc
 }
 
 _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}"
+  _bashrc_ref
 }
 
 _main() {
@@ -71,34 +59,21 @@ _main() {
 
   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
+  elif [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ]; then
     echo "bash overrides already in place"
     echo "skipping..."
     echo
-    fi
   else
-    _bashrc_ref "${FANCYFY}"
+    _bashrc_ref
     echo "bash overrides added"
     echo
   fi
+
+  if [ "${SERVER}" = true ]; then
+    sed -i 's/terminal_fancyfying/terminal_fancyfying_server/' ~/.bashrc_overrides/_all
+  fi
 }
 
 _main "$@"