diff options
Diffstat (limited to 'bash/dot-profile')
| -rw-r--r-- | bash/dot-profile | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/bash/dot-profile b/bash/dot-profile index cd3f5cd..072595b 100644 --- a/bash/dot-profile +++ b/bash/dot-profile @@ -4,7 +4,7 @@ export EDITOR=nvim export SUDO_EDITOR=$EDITOR export BAT_THEME=ansi -export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'" +export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat --paging always -p -lman'" export XDG_CONFIG_HOME="$HOME"/.config export XDG_CACHE_HOME="$HOME"/.cache @@ -12,9 +12,8 @@ export XDG_DATA_HOME="$HOME"/.local/share export XDG_STATE_HOME="$HOME"/.local/state export XDG_BIN_HOME="$HOME"/.local/bin -source "$XDG_CONFIG_HOME"/bash/path.bash - -path_add "$XDG_BIN_HOME" +PATH="${PATH}:${XDG_BIN_HOME}" +export PATH export LESSHISTFILE="$XDG_CACHE_HOME"/lesshst export CARGO_HOME="$XDG_DATA_HOME"/cargo @@ -25,32 +24,19 @@ export GOPATH="$XDG_DATA_HOME"/go export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc-2.0 export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/default/config -export GEM_HOME="$(gem env user_gemhome 2>/dev/null)" - -[ -n "$GEM_HOME" ] && path_add "$GEM_HOME/bin" - -# [ -d "$HOME/.nix-profile" ] && export XDG_DATA_DIRS="$HOME"/.nix-profile/share:"$XDG_DATA_DIRS" -# [ -d "$HOME/.nix-profile" ] && . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" unset SSH_AGENT_PID if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" - export SSH_AUTH_SOCK + SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + export SSH_AUTH_SOCK fi -# disable accessibility -export NO_AT_BRIDGE=1 -export GTK_A11Y=none - -path_clean - -# if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ] && [ -z "$NIRI_LOADED" ]; then -# export NIRI_LOADED=1 -# exec niri-session -# fi - -if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ] ; then - if uwsm check may-start; then - exec systemd-cat -t uwsm_start uwsm start hyprland.desktop - fi +if [ -z "$WAYLAND_DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then + # NOTE: if the first argument of niri-session is not -l, then niri-session will + # exec a new "login shell" with `exec -l bash -c 'niri-session -l'`. + # This means that environment variables set here are going to be duplicated + # (such as PATH). + # See + # https://github.com/YaLTeR/niri/blob/10df9f4717cbd4efd20ae796eb6b0aa400127bdc/resources/niri-session#L17-L21 + niri-session -l fi |