fix an eww thing, tidy default bashrc

default/bashrc.d/default

@@ -4,8 +4,6 @@ if [[ -z ${ZELLIJ} ]] && command -v zellij; then
   zellij && exit
 fi
 
-export EDITOR=hx
-export VISUAL="${EDITOR}"
 
 if [[ -f /usr/share/terminfo/a/alacritty ]];then
   export TERM=xterm-256color
@@ -28,7 +26,7 @@ function Sudo {
 alias h="history|grep "
 #search files in current and sub dirs
 #alias f="find . |grep "
-find_file() {
+findfile() {
   find . -name *"${1}"*
 }
 #find running processes
@@ -186,15 +184,14 @@ alias gitdiff='git diff --name-only'
 gitchanges() {
   printf '%b\n' "\033[1m"'Modified Files:'"\033[0m"
   while read l; do printf ' - %s\n' "${l}"; done < <(git diff --name-only)
-  #  git diff --name-only
   printf '%b\n' "\033[1m"'Untracked Files:'"\033[0m"
-  #  git ls-files . --exclude-standard --others
   while read l; do printf ' - %s\n' "${l}"; done < <(git ls-files . --exclude-standard --others)
 }
 
 dpkg-log-search() {
   zgrep "${1}" /var/log/dpkg.log*
 }
+
 #apt update summary
 alias thong-list="sudo apt update;apt list --upgradable"
 alias thong="sudo apt update;sudo apt upgrade"
@@ -204,71 +201,60 @@ export DEBEMAIL="support@pogmom.me"
 export DEBFULLNAME="Penelope Gwen"
 
 #SSH Personal Machines
-alias pogmommy-omen-328p1aa="ssh pogmommy-omen-328p1aa"
+alias omen-328p1aa="ssh pogmommy-omen-328p1aa"
-alias pogmommy-apple-a2337="ssh pogmommy-apple-a2337"
+alias apple-a2337="ssh pogmommy-apple-a2337"
-alias pogmommy-apple-a2337-vpn="ssh pogmommy-apple-a2337-vpn"
-alias pogmommy-dell-p135g="ssh pogmommy-dell-p135g"
 
 #Git env vars
-GIT_AUTHOR_NAME="Penelope Gwen"
+export GIT_AUTHOR_NAME="Penelope Gwen"
-GIT_AUTHOR_EMAIL="penelope@pogmom.me"
+export GIT_AUTHOR_EMAIL="penelope@pogmom.me"
-GIT_EDITOR="/usr/bin/nano"
+export GIT_EDITOR="/usr/bin/nano"
-
-#Bash Prompt Customization
-#prompt_prefix=""
-#if [ -n "${SSH_CLIENT}" ] || [ -n "${SSH_TTY}" ]; then
-#  prompt_prefix="${prompt_prefix} [SSH] "
-#fi
-#if [[ "$HOSTNAME" == pod* ]]; then
-#  prompt_prefix="${prompt_prefix} [POD] "
-#  mkdir -p "${HOME}/.devpod/$(uname -m)"
-#  export CARGO_HOME="${HOME}/.devpod/$(uname -m)/.cargo"
-#  export RUSTUP_HOME="${HOME}/.devpod/$(uname -m)/.rustup"
-#  cd ${POD_PATH}
-#fi
 
 [[ -d $HOME/.local/bin ]] && export PATH="$HOME/.local/bin:$PATH"
-[[ -d $HOME/.cargo/bin ]] && export PATH="$HOME/.cargo/bin:$PATH"
 #[[ -d $HOME/.rustup/toolchains/nightly-$(uname -m)-unknown-linux-gnu/bin ]] && export PATH="$HOME/.rustup/toolchains/nightly-$(uname -m)-unknown-linux-gnu/bin:$PATH"
 
-export PYENV_ROOT="$HOME/.pyenv"
-[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init - bash 2>/dev/null)"
-
 [[ -d $HOME/.local/share/gem/ruby/3.3.0/bin ]] && export PATH="$HOME/.local/share/gem/ruby/3.3.0/bin:$PATH"
 
-export NODE_PATH=$HOME/.local/lib/node_modules:$NODE_PATH
-export npm_config_prefix=$HOME/.local
-
-#TPUT_RED="$(tput setaf 1)$(tput setab 0)"
-#TPUT_MAGENTA_BG="$(tput setab 5)$(tput setaf 0)"
-#TPUT_MAGENTA="$(tput sgr0)$(tput setaf 5)"
-#TPUT_MAGENTA="$(tput setab 0)$(tput setaf 5)"
-#TPUT_BLACK="$(tput sgr0)$(tput setaf 0)"
-
-#export prompt_prefix=`awk '{$1=$1};1' <<< "${prompt_prefix}"`
-#PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]\n\$ '
-#PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
-
-#PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[${TPUT_MAGENTA_BG}▓▒░ 󰊟 \u ${TPUT_MAGENTA} ${TPUT_RED}󰣚 ${TPUT_MAGENTA}$(hostname |  cut -d - -f 3-) ${TPUT_BLACK} \[\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
-#PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[${TPUT_MAGENTA_BG} 󰊟 \u${TPUT_MAGENTA} ${TPUT_RED}󰣚\[\e[00m\] \[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
-
-#PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]󰊟 \u ${TPUT_RED}󰣚\[\e[00m\] \[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
-#PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s"|xargs printf "\\e]2;%s — Alacritty\007")\[\e[00m\]\n\$ '
-
 #Alacritty custom window title
 if [ "$TERM" = alacritty ]; then
   PROMPT_COMMAND='pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\/.*)(?=\/.*\/)/\/…/s"|xargs printf "\e]2;%s — Alacritty\007"'
 fi
 
-eval "$(starship init bash)"
+if type starship >/dev/null 2>&1;then
+  eval "$(starship init bash)"
+else
+  TPUT_RED="$(tput setaf 1)$(tput setab 0)"
+  TPUT_MAGENTA_BG="$(tput setab 5)$(tput setaf 0)"
+  TPUT_MAGENTA="$(tput sgr0)$(tput setaf 5)"
+  TPUT_BLACK="$(tput sgr0)$(tput setaf 0)"
+  prompt_prefix=$(awk '{$1=$1};1' <<< "${prompt_prefix}");export prompt_prefix
+  PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]\[${TPUT_MAGENTA_BG}▓▒░ 󰊟 \u ${TPUT_MAGENTA} ${TPUT_RED}󰣚 ${TPUT_MAGENTA}$(hostname |  cut -d - -f 3-) ${TPUT_BLACK} \[\[\e[01;34m\]$(pwd|sed "s|${HOME}|~|"|perl -pe "s/(?<!(^~))(\\/.*)(?=\\/.*\\/)/\\/…/s")\[\e[00m\]\n\$ '
+fi
+
+if type npm >/dev/null 2>&1;then
+  export NODE_PATH=$HOME/.local/lib/node_modules:$NODE_PATH
+  export npm_config_prefix=$HOME/.local
+fi
+
+if type pyenv >/dev/null 2>&1;then
+  export PYENV_ROOT="$HOME/.pyenv"
+  [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+  eval "$(pyenv init - bash)"
+fi
+
+if type hx >/dev/null 2>&1;then
+  EDITOR=$(which hx)
+else
+  EDITOR=$(which nano)
+fi
+
+export EDITOR
+export SUDO_EDITOR=${EDITOR}
+export VISUAL="${EDITOR}"
 
-#bind TAB:menu-complete
-#set show-all-if-ambiguous on
 bind 'set show-all-if-ambiguous on'
 bind 'set completion-ignore-case on'
 
-if command -v hyfetch &> /dev/null;then
+if type hyfetch >/dev/null 2>&1;then
   hyfetch 2>/dev/null
 fi
 

wayland/config/eww/variables/bar/sway-info.yuck

@@ -1,2 +1,2 @@
-(deflisten sway_info :initial '{"window_info":{"title":"","window_count":0},"workspace_info":[],"workspace_profile":{"icon":"","name":"","scripts":[]}}'
+(deflisten sway_info :initial '{"scratchpad_info": [{"icon":"/usr/share/icons/breeze-dark/mimetypes/32/unknown.svg","name":"","title":"","visible":false,"window_id":0}],"window_info":{"title":"","window_count":0},"workspace_info":[],"workspace_profile":{"icon":"","name":"","scripts":[]}}'
   "sdu sway get -m")