fixed typo, updated variable fancyfy

removes comments from file and prints the rest

README.md

@@ -1,4 +1,10 @@
-# personal-kde-config
+# Personal Linux config
-Personal KDE and other Linux-related configs to help me succeed in life (or at least simplify it).
+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,13 +1,12 @@
 for source in colored_commands \
               convenience_aliases \
+              docker_aliases \
               git_functions \
               histcontrol \
               home_bin_folder \
               ls_aliases \
               safety_aliases \
               terminal_colors \
-              terminal_fancyfying; do
+              terminal_fancyfying_${TERMINAL_FANCYFY}; do
-  if [ -f ~/.bashrc_overrides/$source ]; then
+  . "$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/$source"
-    . ~/.bashrc_overrides/$source
-  fi
 done

bashrc_overrides/convenience_aliases

@@ -1,4 +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/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}"

deploy.sh

@@ -2,17 +2,17 @@
 
 THIS="$(dirname "$(readlink -fm "$0")")"
 SERVER=false
-FORCE=false
+DELETE=false
-CLEANUP=false
+MOVE=false
 
 _arguments() {
   for PARM in "$@"; do
     if [ "${PARM}" = "--server" ]; then
       SERVER=true
-    elif [ "${PARM}" = "--force" ]; then
+    elif [ "${PARM}" = "--delete" ]; then
-      FORCE=true
+      DELETE=true
-    elif [ "${PARM}" = "--cleanup" ]; then
+    elif [ "${PARM}" = "--move" ]; then
-      CLEANUP=true
+      MOVE=true
     elif [ "${PARM}" = "-h" ] || [ "${PARM}" = "--help" ]; then
       _help
       exit 0
@@ -24,44 +24,55 @@ _help() {
   echo "Usage: $(readlink -fm "$0") [-h | --help] [--cleanup]"
   echo
   echo "Options:"
-  echo "  -h | --help : Prints this help message and quits"
+  echo "  -h | --help"
-  echo "  --server: Customizes the terminal feel for a server installation"
+  echo "    Prints this help message and quits"
-  echo "  --cleanup: Removes the source folder after installation"
+  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() {
+_delete() {
-  cp -r bashrc_overrides ~/.bashrc_overrides
+  sed -i '/REF:bashrc_overrides:REF/{N;d}' ~/.bashrc
-  echo "#REF:bashrc_overrides:REF" >> ~/.bashrc
-  echo "if [ -f ~/.bashrc_overrides/_all ]; then" >> ~/.bashrc
-  echo "  . ~/.bashrc_overrides/_all" >> ~/.bashrc
-  echo "fi" >> ~/.bashrc
 }
 
-_cleanup() {
+_bashrc_ref() {
-  rm -rf ${THIS}
+  echo "#REF:bashrc_overrides:REF" >> ~/.bashrc
+  echo "export TERMINAL_FANCYFY=client" >> ~/.bashrc
+  echo ". ${THIS}/bashrc_overrides/_all" >> ~/.bashrc
+}
+
+_move() {
+  _delete
+  _bashrc_ref
 }
 
 _main() {
   _arguments "$@"
 
-  if [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ] && [ "${FORCE}" = false ]; then
+  if [ "${DELETE}" = true ]; then
+    _delete
+  elif [ "${MOVE}" = true ]; then
+    _move
+  elif [ ! -z "$(grep "#REF:bashrc_overrides:REF" ~/.bashrc)" ]; then
     echo "bash overrides already in place"
     echo "skipping..."
     echo
   else
-    _bash_overrides
+    _bashrc_ref
     echo "bash overrides added"
     echo
   fi
 
   if [ "${SERVER}" = true ]; then
-    sed -i 's/terminal_fancyfying/terminal_fancyfying_server/' ~/.bashrc_overrides/_all
+    sed -i 's/terminal_fancyfying/terminal_fancyfying_server/' ${THIS}/bashrc_overrides/_all
-  fi
+  else
-
+    sed -i 's/terminal_fancyfying_server/terminal_fancyfying/' ${THIS}/bashrc_overrides/_all
-  if [ "${CLEANUP}" = true ]; then
-    echo "cleaning up..."
-    _cleanup
   fi
 }