From 1bd2b586d4c7d6381af548944b75f57458f0d337 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Sat, 20 Aug 2022 16:34:28 -0500 Subject: feat(sh): inherit env from environment.d --- sh/.profile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'sh/.profile') diff --git a/sh/.profile b/sh/.profile index f865eb2..1098a70 100644 --- a/sh/.profile +++ b/sh/.profile @@ -1,24 +1,29 @@ #!/bin/sh -# shellcheck disable=2155 +# shellcheck disable=1091,2046 -# https://wiki.archlinux.org/title/XDG_Base_Directory +# environment.d +if [ -x /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator ]; then + export $(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator) +fi + +# xdg export XDG_CONFIG_HOME="$HOME/.config" export XDG_CACHE_HOME="$HOME/.cache" export XDG_DATA_HOME="$HOME/.local/share" export XDG_STATE_HOME="$HOME/.local/state" export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u "$USER")}" -export ZDOTDIR="$XDG_CONFIG_HOME/zsh" -export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME/bash-completion/completions" -export LESSHISTFILE="$XDG_STATE_HOME/lesshst" -export WGETRC="$XDG_CONFIG_HOME/wgetrc" - -# Misc -export EDITOR="$(command -v nvim 2>/dev/null || command -v vim 2>/dev/null || command -v vi)" -export BROWSER="$(command -v firefox || command -v chromium 2>/dev/null)" +# prog +EDITOR="$(command -v nvim 2>/dev/null || command -v vim 2>/dev/null || command -v vi)" +BROWSER="$(command -v chromium 2>/dev/null || command -v firefox)" +export EDITOR BROWSER export TERMINAL="alacritty" export MANPAGER="sh -c 'col -bx | bat -l man -p'" + +# opts export MANROFFOPT="-c" +export LESSHISTFILE="$XDG_STATE_HOME/lesshst" +export WGETRC="$XDG_CONFIG_HOME/wgetrc" export STARSHIP_LOG="error" export FZF_PREVIEW_COMMAND="bat --style=numbers,changes --wrap never --color always {} || cat {} || exa --tree --icons --git-ignore {} || tree -C {}" export FZF_DEFAULT_COMMAND="fd --type f || git ls-tree -r --name-only HEAD || rg --files || find ." @@ -26,6 +31,7 @@ export FZF_DEFAULT_OPTS='--exit-0 --select-1 --bind "ctrl-q:abort,ctrl-y:preview export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS="--min-height 30 --preview-window down:60% --preview-window noborder --preview '($FZF_PREVIEW_COMMAND) 2> /dev/null'" +# path export PATH="$PATH:$HOME/.local/bin" # rust -- cgit v1.2.3-70-g09d2