2 files changed, 89 insertions, 33 deletions
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index abcb471..2168058 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -1,10 +1,9 @@
 #!/bin/sh
+# Filip's aliasrc
 
 # Use $XINITRC variable if file exists.
 [ -f "$XINITRC" ] && alias startx="startx \$XINITRC"
 
-[ -f "$MBSYNCRC" ] && alias mbsync="mbsync -c \$MBSYNCRC"
-
 # sudo not required for some system commands
 sudo_cmds="mount umount sv apt apt-get aptitude dpkg su shutdown poweroff reboot cryptsetup"
 for command in $sudo_cmds; do
@@ -23,6 +22,8 @@ alias \
     rsync="rsync -vrPlu" \
     pstree="pstree -np" \
     less="less -XER" \
+    ls="lsn" \
+    vim="nvim" \
 
 # Colorize commands when possible.
 alias \
@@ -33,15 +34,14 @@ alias \
     fgrep="fgrep --color=auto" \
     grep="grep --color=auto" \
     ip="ip -color=auto" \
-    ls="lsn" \
     vdir="vdir --color=auto" \
 
 # Making stuff easy to customize and source automatically
 alias \
-  vrc='vim "$HOME/.config/vim/.vimrc"' \
-  zal='vim "$ZDOTDIR/aliasrc"  && source "$ZDOTDIR/aliasrc"' \
-  zen='vim "$ZDOTDIR/envvarrc" && source "$ZDOTDIR/envvarrc"' \
-  zrc='vim "$ZDOTDIR/.zshrc"   && source "$ZDOTDIR/.zshrc"' \
+  vrc='$EDITOR "$HOME/.config/nvim/init.lua"' \
+  zal='$EDITOR "$ZDOTDIR/aliasrc"  && source "$ZDOTDIR/aliasrc"' \
+  zen='$EDITOR "$ZDOTDIR/envvarrc" && source "$ZDOTDIR/envvarrc"' \
+  zrc='$EDITOR "$ZDOTDIR/.zshrc"   && source "$ZDOTDIR/.zshrc"' \
 
 # Aliases for connecting to server
 alias \
@@ -51,9 +51,7 @@ alias \
 # Making stuff shorter
 alias \
     ..="cd .." \
-    b="buku --suggest" \
     bat="batcat" \
-    bd="buku-dmenu" \
     copy="xsel -ib" \
     fd="fdfind" \
     ipy="ipython3" \
@@ -68,5 +66,6 @@ alias \
 # Git aliases
 alias \
     dotfiles="/usr/bin/git --git-dir=\$HOME/.dotfiles --work-tree=\$HOME" \
-
-# Limbo
+    ga="git add" \
+    gc="git commit" \
+    gp="git push" \
diff --git a/.config/shell/envvarrc b/.config/shell/envvarrc
index 794557a..5357f95 100644
--- a/.config/shell/envvarrc
+++ b/.config/shell/envvarrc
@@ -1,36 +1,93 @@
 #!/bin/sh
-# This little script sets my environment variables.
+# Filip's envvarrc
+# This litte script sets my environment variables.
+
 
 # Primary programs
 export BROWSER="librewolf"
-export EDITOR="vim"
+export EDITOR="nvim"
 export IMAGE_VIEWER="feh"
 export MANPAGER="vim -M +MANPAGER -"
-export SHELL="/usr/bin/zsh"
 export TERMINAL="st"
+export SHELL="zsh"
 
-# PATH and scripts directory
-export SCRIPTS="$HOME/.scripts"
-export PATH="$SCRIPTS:$HOME/.cargo/bin:$HOME/.local/bin:$PATH"
 
-# Other stuff
+# XDG base directories
+export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CACHE_HOME="$HOME/.cache"
+
+
+# PATH and scripts
+export SCRIPTS="$HOME/.scripts"
+
+for dir in \
+  "$SCRIPTS" \
+  "$HOME/langs/R" \
+  "$HOME/.cargo/bin" \
+  "$HOME/.local/bin"
+do
+  [ -d "$dir" ] && PATH="$dir:$PATH"
+done
+
+export PATH
+
+
+# Shell / config locations
+export ZDOTDIR="$XDG_CONFIG_HOME/shell"
+export ZSHDIR="$ZDOTDIR"
+export ALIASRC="$ZDOTDIR/aliasrc"
+export ENVVARRC="$ZDOTDIR/envvarrc"
+
+
+# X / input
 export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
-export ALIASRC="$HOME/.config/shell/aliasrc"
-export ZSHDIR="$HOME/.config/shell"
-export ENVVARRC="$HOME/.config/shell/envvarrc"
-export CONDARC="$HOME/.config/conda/.condarc"
-export _CONDA_ROOT="$HOME/.local/opt/miniconda3"
-export GOPATH="$HOME/langs/go"
-export IPYTHONDIR="$HOME/.config/ipython"
-export OBSIDIAN_HOME="$HOME/.cache/obsidian"
-export STARDICT_DATA_DIR="$HOME/.local/share/stardict"
-export R_HISTFILE="$HOME/langs/R/.Rhistory"
-export R_HOME="$HOME/langs/R"
+export XINPUTRC="$XDG_CONFIG_HOME/x11/xinputrc"
+
+
+# Language runtimes & tools
+# R
+export R_HOME="/usr/lib/R"
 export R_LIBS_USER="$HOME/langs/R"
 export R_PROFILE="$HOME/langs/R/.Rprofile"
-export MYVIMRC="$HOME/.config/vim/.vimrc"
-export VIMINFO="$HOME/.config/vim/.viminfo"
-export VIMINIT="source $MYVIMRC"
+export R_HISTFILE="$HOME/langs/R/.Rhistory"
+
+# Go
+export GOPATH="$HOME/langs/go"
+
+# Python / Conda
+export _CONDA_ROOT="$HOME/.local/opt/miniconda3"
+export IPYTHONDIR="$XDG_CONFIG_HOME/ipython"
+
+# Ren'Py
+export RENPY_USER="$HOME/langs/python/renpy"
+
+
+# Neovim
+export NVIMPLUGINS="$XDG_CONFIG_HOME/nvim/lua/plugins"
+export NVIMSNIPPETS="$XDG_CONFIG_HOME/nvim/lua/snips"
+
+
+# CLI / TUI tools
+export TIGRC_USER="$XDG_CONFIG_HOME/tig/tigrc"
+export STARSHIP_CONFIG="$XDG_CONFIG_HOME/starship/starship.toml"
+export STARSHIP_CACHE="$XDG_CACHE_HOME/starship/cache"
+export SUDO_ASKPASS="askpass"
+
+
+# Applications & data
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
+export STARDICT_DATA_DIR="$XDG_DATA_HOME/stardict"
+export OBSIDIAN_HOME="$XDG_CACHE_HOME/obsidian"
+
+
+# Locale
+export LANG="en_US.UTF-8"
+export LC_ALL="en_US.UTF-8"
+export LC_CTYPE="UTF-8"
+
+
+# TEMPORARY
+export TRANSITLAND_API_KEY="Wj10MMRSKE4PJTNgtGLB5bK5cXd0Pyyr"
+export DUFFEL_API_TOKEN="duffel_test_I5aqDofO6D445pIQRsOZlU9leLCjSqfiQ7_B0G4SRxb"
+export GEOAPIFY_API_KEY="29df0878ddb04c6aaca758653f692eed"