From 21fac388f96806e234c6c354a35b40ea7d8076a6 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Mon, 30 Jan 2023 12:24:24 -0600 Subject: Profile! --- profile/01_path.sh | 19 +++++++++++++++++-- profile/defaults.sh | 4 +--- profile/etc.sh | 2 +- profile/go.sh | 2 ++ profile/infopath.sh | 2 +- profile/manpath.sh | 8 ++++---- profile/profile | 2 +- 7 files changed, 27 insertions(+), 12 deletions(-) diff --git a/profile/01_path.sh b/profile/01_path.sh index b5856e8..6675241 100644 --- a/profile/01_path.sh +++ b/profile/01_path.sh @@ -1,4 +1,19 @@ -# PATH +# PATH and variables for $HOME-local installations + +LOCAL_PREFIX="$LOCAL_PATH" +export LOCAL_PREFIX + +# Pkg-config +path_add_unsafe PKG_CONFIG_PATH "$LOCAL_PREFIX/lib/pkgconfig" +export PKG_CONFIG_PATH + +# LD_LIBRARY_PATH +path_add_unsafe LD_LIBRARY_PATH "$LOCAL_PREFIX/lib" +export LD_LIBRARY_PATH # see 00_functions.sh for `path_add' -path_add_to_PATH "$HOME/bin" "$HOME/usr/bin" "$HOME/usr/scripts" +path_add_to_PATH \ + "$HOME/bin" \ + "$LOCAL_PREFIX/bin" \ + "$LOCAL_PREFIX/scripts" \ + "$LOCAL_PREFIX/games/" diff --git a/profile/defaults.sh b/profile/defaults.sh index 4ee51d2..c158df5 100644 --- a/profile/defaults.sh +++ b/profile/defaults.sh @@ -1,7 +1,5 @@ # Default programs -export EDITOR="$(which emacsclient) -nc" +export EDITOR="$(which em)" # emacs but like, better-er export ALTERNATE_EDITOR= export VISUAL="$EDITOR" - -alias e="$EDITOR" diff --git a/profile/etc.sh b/profile/etc.sh index 0546fe2..151e229 100644 --- a/profile/etc.sh +++ b/profile/etc.sh @@ -10,5 +10,5 @@ export CDPATH=:~ # thanks june :) #export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" #export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" -#export SVDIR="$HOME/.local/service" +#export SVDIR="$LOCAL_PREFIX/service" #export INFOPATH="$INFOPATH:/usr/share/info" diff --git a/profile/go.sh b/profile/go.sh index 205c881..baa4187 100644 --- a/profile/go.sh +++ b/profile/go.sh @@ -1,3 +1,5 @@ +# Go + export GOPATH="$HOME/src/go" # https://drewdevault.com/2022/05/25/Google-has-been-DDoSing-sourcehut.html diff --git a/profile/infopath.sh b/profile/infopath.sh index 92ecd72..b663d20 100644 --- a/profile/infopath.sh +++ b/profile/infopath.sh @@ -2,6 +2,6 @@ path_add_unsafe INFOPATH \ /usr/share/info \ - "${XDG_DATA_HOME:-$HOME/.local/share}/info" + "${XDG_DATA_HOME:-$LOCAL_PREFIX/share}/info" export INFOPATH diff --git a/profile/manpath.sh b/profile/manpath.sh index 9f310e8..b52f5f8 100644 --- a/profile/manpath.sh +++ b/profile/manpath.sh @@ -1,10 +1,10 @@ # See 00_functions.sh for `path_add_unsafe'. path_add_unsafe MANPATH \ - "${XDG_DATA_HOME:-$HOME/.local/share}/man" \ - "$HOME/.local/local/man" \ - "$HOME/usr/local/man" \ - "$HOME/usr/man" + "${XDG_DATA_HOME:-$LOCAL_PREFIX/share}/man" \ + "$LOCAL_PREFIX/local/man" \ + "$LOCAL_PATH/local/man" \ + "$LOCAL_PATH/man" # $MANPATH ends with `:' so that manpath(1) will prepend it to its # special thing. diff --git a/profile/profile b/profile/profile index a531e8e..9a81186 100644 --- a/profile/profile +++ b/profile/profile @@ -7,7 +7,7 @@ source /etc/profile # XDG directories export XDG_CONFIG_HOME="$HOME/etc" export XDG_CACHE_HOME="$HOME/var/cache" -export XDG_DATA_HOME="$HOME/usr/share" +export XDG_DATA_HOME="$LOCAL_PATH/share" export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}" -- cgit 1.4.1-21-gabe81