4 files changed, 4 insertions(+), 11 deletions(-)

M .bashrc
M .config/sway/rock
M .env
M .profile

@@ 1,5 1,5 @@
 # .bashrc
-[ -n "$ENV" ] && . "$ENV" || ([ -e ~/.env ] && . ~/.env)
+[ $0 != sh ] && [ -n "${ENV:=$HOME/.env}" ] && . "$ENV"
 
 PS1='\[\033[1;33m\]$(prompt)\[\033[0m\]'
 HISTCONTROL=ignoreboth:erasedups

@@ 1,2 1,2 @@
-bindsym --to-code --no-warn $mod+Return exec termite
+bindsym --to-code --no-warn $mod+Return exec foot
 

@@ 34,13 34,6 @@ alias gst='git status'
 # Use correct TTY for GPG Pinentry
 export GPG_TTY="$(tty)"
 gpg-connect-agent updatestartuptty /bye >/dev/null
-export TERM=xterm
-export PATH=$HOME/.local/bin:$PATH
-export PATH=$HOME/.local/bin/`hostname`:$PATH
-export PATH=$HOME/.local/bin/`uname -m`:$PATH
-export PATH=$HOME/.cargo/bin:$PATH
-export GOPATH="$HOME/.local/share/go"
-export PATH=$GOPATH/bin:$PATH
 export PATH=$HOME/.local/bin:$PATH
 export PATH=$HOME/.local/bin/`hostname`:$PATH
 export PATH=$HOME/.local/bin/`uname -m`:$PATH

@@ 3,7 3,7 @@ export ENV=~/.env
 export LANG=en_US.UTF-8
 export LC_TIME=de_DE.UTF-8
 export EDITOR=vim
-export TERM=xterm
+export TERM=foot-extra
 export HISTSIZE=65535
 
 export MAKEFLAGS=-j`lscpu | grep '^CPU(s):' | awk -F' ' '{ print $2 }'`


@@ 14,4 14,4 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 export GDK_BACKEND=wayland
 
 [ -e .config/$(hostname).profile ] && . .config/$(hostname).profile
-[ -n $BASH_VERSION ] && shopt login_shell 2>&1 > /dev/null && [ -f ~/.bashrc ] && . ~/.bashrc
+[ $0 != sh ] && [ -n $BASH_VERSION ] && shopt login_shell 2>&1 > /dev/null && [ -f ~/.bashrc ] && . ~/.bashrc