i3wm ➔ hyprland (wip)

still a way to go. but, i am moving in the right direction, at least.

dots/archinstall/tuxwarrior/options.sh

@@ -2,9 +2,8 @@
 
 # klevstul
 
-# these variables are used by 99_deploy.sh, as that script is importing this file using `source`
+# these variables are used by `99_deploy.sh`, where this file is imported using `source`
 
 OPTIONS_LOADED=true     # used to check if options have been loaded
 CLONE_TARGET_DIR=/tmp   # directory to clone dots repository to
 SYSTEM_USER=poq         # system user (! root)
-#I3WM=false               # {true, false} installs i3 packages - used by '99_deploy.sh'

dots/bash/.bashrc

@@ -36,8 +36,6 @@ alias du="du --summarize --human-readable"
 alias dus="du --summarize --human-readable * | sort -h"
 alias encrypt="gpg --encrypt --sign --recipient frode@klevstul.com"
 alias extract="extract.sh"
-alias faf="find . -type f -iname" # faf (find a file)
-alias fif="grep -rnw . -e"  # fif (find in file) | https://stackoverflow.com/questions/16956810/find-all-files-containing-a-specific-text-string-on-linux
 alias gparted="sudo gparted"
 alias grep='grep --color=auto'
 alias ip='ip -br a'
@@ -50,8 +48,8 @@ alias ls='ls --color=auto'
 alias myip="echo $(wget http://ipinfo.io/ip -qO -)"
 alias neofetch='fastfetch'
 alias quantumfix="pw-metadata -n settings 0 clock.force-quantum 1024"
-alias sb="source ~/.bashrc"
-alias sbr="source /home/poq/syncDir/gitRepos/gi.op.fo/lnx-arch/dots/bash/.bashrc" # source bash (from) repo
+alias sb="unalias -a; source ~/.bashrc"
+alias sbr="unalias -a; source /home/poq/syncDir/gitRepos/gi.op.fo/lnx-arch/dots/bash/.bashrc" # source bash (from) repo
 alias sizeInBytes="stat -c %s"
 alias ssh="ssh -v"
 alias ssh_weba_r="ssh -v -t root@weba -p 1808 'export TERM=xterm; cd /tmp; bash -l'"
@@ -74,7 +72,7 @@ alias pgmodeler="/home/poq/syncDir/swas/portableApps/pgmodeler_plus-1*"
 # x terminal shell start string | https://askubuntu.com/questions/1340319/ps1-string-full-documentation-and-reference-page
 # https://bash-prompt-generator.org/
 # https://askubuntu.com/questions/193416/adding-timestamps-to-terminal-prompts
-PS1='\n⚙[\D{%y%m%d%H%M}|\u@\h \w]\$ '
+PS1='\n⚙[\D{%y%m%d%H%M}|\u@\h|\w]\$ '
 #PS1='\[\e[01;32m\]\u@\h \[\e[01;34m\]\w\[\e[00m\]\$ '
 
 # change the window title of x terminals
@@ -88,6 +86,29 @@ case ${TERM} in
 esac
 
 
+# --- 
+# searching
+# ---
+
+# find a file (faf)
+faf() {
+     path="."
+     if [[ -n $2 ]]; then
+          path=$2
+     fi
+     find ${path} -type f -iname ${1} 2>/dev/null
+}
+
+# find in file (fif) | https://stackoverflow.com/questions/16956810/find-all-files-containing-a-specific-text-string-on-linux
+fif() {
+     path="."
+     if [[ -n $2 ]]; then
+          path=$2
+     fi
+     grep -rnw ${path} -e ${1} 2>/dev/null
+}
+
+
 # ---
 # networking
 # ---

dots/bin/gitReposSoftlinker.sh

@@ -5,5 +5,8 @@
 this_file_name=`basename "$0"`
 echo "$this_file_name"
 
+# note: it is possible to create sym links / soft links to non-existing directories! hence, this can be done without having started pcloud.
 ln -s /home/poq/pCloudDrive/repos/git/gitlab.com ~/syncDir/gitRepos/
 ln -s /home/poq/pCloudDrive/repos/pCloud_nonGit ~/syncDir/gitRepos/
+
+ls -al ~/syncDir/gitRepos/

dots/bin/startup.sh

@@ -4,8 +4,10 @@
 
 notify-send "<< startup.sh >>"
 
-nextcloud &			# nextcloud file sync
-pcloud &			# pcloud service
+source /home/poq/syncDir/secrets/toBeSourced/secretsAsEnvVariables.sh       # set secrets as env variables
+
+nextcloud &			                                                        # nextcloud file sync
+pcloud &			                                                        # pcloud service
 
 if [[ "${HOSTNAME}" == "tuxwarrior" ]] ; then
     hyprmon --profile office &

dots/environment/environment

@@ -6,9 +6,17 @@
 # note: a re-login is needed for changes to take place
 #
 
+# secrets
+# please note that this file is open to the world, so secrets should only be stored in
+# `/home/poq/syncDir/secrets/toBeSourced/secretsAsEnvVariables.sh`, as that file is
+# sourced by statup.sh.
+
+# note on paths:
+# even though it would possible to specify unique paths per host machine, that would most
+# likely not work very well. this is as several scripts assume `/home/poq/` etc. so, use
+# the same path for all hosts.
+
 # full path to directory where syncronised data will be kept
-# this should be independent from systems (like nextcloud, dropbox, google drive etc)
-# this as we easily should be able to switch system without having to change this name/path
 # format: SYNCDIR_[HOSTNAME]
 SYNCDIR_t470p=/home/poq/nextcloud/syncDir
 SYNCDIR_tuxwarrior=/home/poq/nextcloud/syncDir
@@ -26,9 +34,6 @@ DOWNLOADS=/home/poq/syncDir/0_downloads
 # styling for gtk apps
 #GTK_THEME=Sweet-Dark
 
-# secrets
-#SECRET_KD3=RtKFWJIoXWjU80mlo4T4Ey2mqDNeJQwHjYLkE0ViN+k
-
 # used by lf
 #EDITOR=nano