From 953e0a3964e6c6f787c7ea70e1ffa26f254e2236 Mon Sep 17 00:00:00 2001 From: Marc Vertes Date: Tue, 21 Jan 2025 18:05:15 +0100 Subject: fixup --- .bashrc | 6 ++++++ .profile | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.bashrc b/.bashrc index 2b7fe4b..9450783 100644 --- a/.bashrc +++ b/.bashrc @@ -19,6 +19,12 @@ stty -ixon # disable Ctrl-S #export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND" case $(uname -o) in +(Android) + PATH=~/bin:${HOME%/*}/usr/bin:~/go/bin + export GNUTERM='sixelgd enhanced truecolor font "arial,9"' + alias ls='ls --color=auto -v' + alias ll='ls -AlFhv' + ;; (Darwin) export GNUTERM='sixelgd enhanced truecolor size 1600,1200 font "arial,9"' alias ls='ls -GF' diff --git a/.profile b/.profile index afd9468..878c4b0 100644 --- a/.profile +++ b/.profile @@ -2,6 +2,7 @@ case $(uname -o) in (Android) + PATH=~/bin:${HOME%/*}/usr/bin:~/go/bin ;; (Darwin) PATH=~/bin:~/mu/bin:/opt/homebrew/bin:/opt/homebrew/opt/ruby/bin:/opt/homebrew/opt/tcl-tk/bin:$PATH:~/go/bin:~/.cargo/bin:~/.pyenv/versions/2.7.18/bin:~/.local/bin @@ -14,16 +15,20 @@ case $(uname -o) in . "/opt/homebrew/etc/profile.d/bash_completion.sh" tabs -4 export HOMEBREW_NO_ANALYTICS=1 + case $SHELL in + (*/ash) export ENV=~/.shrc ;; + (*/bash) . ~/.bashrc ;; + esac ;; (Linux|GNU/Linux) PATH=~/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:~/go/bin export XDG_RUNTIME_DIR=/run/user/$(id -u) - ;; -esac + case $SHELL in + (*/ash) export ENV=~/.shrc ;; + (*/bash) . ~/.bashrc ;; + esac -case $SHELL in -(*/ash) export ENV=~/.shrc ;; -(*/bash) . ~/.bashrc ;; + [ "$(tty)" = /dev/tty1 ] && [ -x /usr/bin/sway ] && exec dbus-run-session -- sway || true + ;; esac -[ "$(tty)" = /dev/tty1 ] && [ -x /usr/bin/sway ] && exec dbus-run-session -- sway || true -- cgit v1.2.3