From acc0e5f18e47b47c6a9c2aed64349a00d93cec63 Mon Sep 17 00:00:00 2001
From: Mehdi Sadeghi <mehdi@mehdix.org>
Date: Wed, 16 Feb 2022 08:34:19 +0100
Subject: Set term to foot. Fix loading env from su.

---
 .bashrc           | 2 +-
 .config/sway/rock | 2 +-
 .env              | 7 -------
 .profile          | 4 ++--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.bashrc b/.bashrc
index 8311554..74bba13 100644
--- a/.bashrc
+++ b/.bashrc
@@ -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
diff --git a/.config/sway/rock b/.config/sway/rock
index 40f82ca..7c6bbe3 100644
--- a/.config/sway/rock
+++ b/.config/sway/rock
@@ -1,2 +1,2 @@
-bindsym --to-code --no-warn $mod+Return exec termite
+bindsym --to-code --no-warn $mod+Return exec foot
 
diff --git a/.env b/.env
index ecf316c..ab8d692 100644
--- a/.env
+++ b/.env
@@ -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
diff --git a/.profile b/.profile
index 1fa0655..4832034 100644
--- a/.profile
+++ b/.profile
@@ -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
-- 
cgit v1.2.3