aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Matei Pintilie <luca@lucamatei.com>2023-05-24 20:24:12 +0000
committerLuca Matei Pintilie <luca@lucamatei.com>2023-05-24 20:24:12 +0000
commit2d9869a79ae99fe089c539ac59de678149cbfd48 (patch)
tree33df11d0c5883b9d3952d1f5fa71ace26401399a
parent0517926ee7ff8651def9f0b89f71a87d1173c928 (diff)
downloaddotfiles-2d9869a79ae99fe089c539ac59de678149cbfd48.tar
dotfiles-2d9869a79ae99fe089c539ac59de678149cbfd48.tar.gz
dotfiles-2d9869a79ae99fe089c539ac59de678149cbfd48.tar.bz2
dotfiles-2d9869a79ae99fe089c539ac59de678149cbfd48.tar.lz
dotfiles-2d9869a79ae99fe089c539ac59de678149cbfd48.tar.xz
dotfiles-2d9869a79ae99fe089c539ac59de678149cbfd48.tar.zst
dotfiles-2d9869a79ae99fe089c539ac59de678149cbfd48.zip
profile: Better compatibility with void linux and pnpm
-rwxr-xr-x.bashrc2
-rwxr-xr-x.profile12
2 files changed, 10 insertions, 4 deletions
diff --git a/.bashrc b/.bashrc
index 7ba29d2..dd9ede3 100755
--- a/.bashrc
+++ b/.bashrc
@@ -18,7 +18,6 @@ fi
. "$HOME"/.profile
-# Put your fun stuff here.
alias cls="clear"
BAT="$(which bat 2> /dev/null || which batcat 2> /dev/null)"
@@ -30,6 +29,7 @@ fi
alias ls="$(which lsd 2> /dev/null || echo "ls -h -F --color=auto --group-directories-first")"
alias sudo="$(which doas 2> /dev/null || which sudo 2> /dev/null || echo "su -c")"
alias codium="flatpak run com.vscodium.codium --no-sandbox --enable-features=UseOzonePlatform --ozone-platform=wayland"
+alias mpv="$(which mpv 2> /dev/null || echo "flatpak run io.mpv.Mpv")"
alias tmux="tmux -2"
. /usr/share/bash-completion/bash_completion
diff --git a/.profile b/.profile
index bfe7c25..e55c012 100755
--- a/.profile
+++ b/.profile
@@ -1,7 +1,7 @@
#!/usr/bin/env sh
if [ -z "$XDG_RUNTIME_DIR" ]
then
- XDG_RUNTIME_DIR="/tmp/$UID-runtime-dir"
+ XDG_RUNTIME_DIR="/tmp/$(id -u)-runtime-dir"
export XDG_RUNTIME_DIR
if [ ! -d "$XDG_RUNTIME_DIR" ]
then
@@ -26,6 +26,9 @@ GTK_THEME="Dracula"
BAT_THEME="Dracula"
TERMINAL="alacritty"
XDG_CONFIG_HOME="$HOME/.config"
+XDG_CACHE_DIR="$HOME/.cache"
+GOPATH="$XDG_CACHE_DIR/go"
+PNPM_HOME="$HOME/.local/share/pnpm"
export DENO_INSTALL
export DENO_NO_UPDATE_CHECK
@@ -33,6 +36,9 @@ export DENO_NO_PROMPT
export DOTNET_CLI_TELEMETRY_OPTOUT
export NEXT_TELEMETRY_DEBUG
export XDG_CONFIG_HOME
+export XDG_CACHE_DIR
+export GOPATH
+export PNPM_HOME
export GOPROXY
export EDITOR
@@ -41,7 +47,7 @@ export BAT_THEME
export TERMINAL
BAT="$(which bat 2> /dev/null || which batcat 2> /dev/null)"
-if [ -n "$BAT" ]
+if [ -n "$BAT" ] && man --version 2> /dev/null
then
MANPAGER="sh -c 'col -bx | $BAT -l man -p'"
export MANPAGER
@@ -67,6 +73,6 @@ then
export XDG_SESSION_TYPE
fi
-PATH="$HOME/go/bin:$DENO_INSTALL/bin:$BUN_INSTALL/bin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/.luarocks/bin:$HOME/.dotnet/tools:$PATH"
+PATH="$PNPM_HOME:$GOPATH/bin:$DENO_INSTALL/bin:$BUN_INSTALL/bin:$HOME/.cargo/bin:$HOME/.local/bin:$HOME/.luarocks/bin:$HOME/.dotnet/tools:$PATH"
export PATH