.bashrc

@@ -7,43 +7,32 @@
 
 # alias ls='ls --color=auto'
 PS1='\[\e[38;5;249m\]+$(jobs | wc -l)\[\e[38;5;24m\][$(ip route get 1.1.1.1 2>/dev/null | awk -F"src " '"'"'NR==1{split($2,a," ");print a[1]}'"'"')\[\e[38;5;46m\]:\[\e[38;5;208m\]\W\[\e[38;5;24m\]]\$ \[\e[0m\]'
+alias luamake=/home/oliver/sources/lua-language-server/3rd/luamake/luamake
+alias l=lfcd
+alias clip="xclip -selection clipboard"
+alias phone="simple-mtpfs"
+alias bell="paplay /usr/share/sounds/freedesktop/stereo/complete.oga"
+alias usage="du -h -d 1 2> /dev/null | sort -h"
+# For laptop multi-gpu offloading
+alias nvidia_gpu="DRI_PRIME=1 __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia"
+# Opinionated defaults
+alias feh="swallow feh --force-aliasing --draw-exif --scale-down --draw-filename"
+alias ffplay="swallow ffplay $@"
+alias shutdown="shutdown -P now"
+alias untar="tar -xvf $@"
+alias cura="cura5 -platformtheme gtk3"
 
+export DENO_INSTALL="/home/oliver/.deno"
+export PATH="$PATH:$DENO_INSTALL/bin:$HOME/.cargo/bin:$HOME/.local/bin/"
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export TORCH_CUDA_VERSION="cu117"
+export LIBTORCH="/home/oliver/sources/libtorchcxx11"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LIBTORCH}/lib"
+export WINEPREFIX="$HOME/.wine/"
 export DXVK_HUD="fps,compiler"
 export EDITOR="nvim"
 export TZ='America/Denver'
 
-# XDG
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-
-# Clean ~/
-# Languages
-export GOPATH="$XDG_DATA_HOME/go"
-export GOMODCACHE="$XDG_DATA_HOME/go/mod"
-export RBENV_ROOT="$XDG_DATA_HOME/rbenv"
-export PYENV_ROOT="$XDG_DATA_HOME/pyenv"
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export DENO_INSTALL="$XDG_DATA_HOME/deno"
-export DOTNET_CLI_HOME="$XDG_DATA_HOME/dotnet"
-export PYTHON_HISTORY="$XDG_CACHE_HOME/pyhton_history"
-# Programs
-export LESSHIST="-"
-export WINEPREFIX="$XDG_CONFIG_HOME/wine"
-export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
-export XAUTHORITY="$XDG_CONFIG_HOME/x11/Xauthority"
-export GIT_CONFIG_GLOBAL="$XDG_CONFIG_HOME/gitconfig"
-export HISTFILE="$XDG_CACHE_HOME/bash_history"
-# Would need to be run as root, prevents the creation of "~/.sudo_as_admin_successful"
-# echo Default !admin_flag >> /etc/sudoers.d/disable_saas
-
-# Paths
-export PATH="$PATH:$HOME/.local/bin/"
-export PATH="$PATH:$CARGO_HOME/bin:$DENO_INSTALL/bin:$PYENV_ROOT/bin"
-
 lfcd() {
 	tmp="$(mktemp)"
 	lfrun -last-dir-path="$tmp" "$@"
@@ -58,9 +47,3 @@ lfcd() {
 	    fi
 	fi
 }
-
-# Load aliases from file
-if [ -f $XDG_CONFIG_HOME/aliasrc ]; then
-    . $XDG_CONFIG_HOME/aliasrc
-fi
-

.config/aliasrc

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# New commands
-alias clip="xclip -selection clipboard"
-alias phone="simple-mtpfs"
-alias bell="paplay /usr/share/sounds/freedesktop/stereo/complete.oga"
-alias usage="du -h -d 1 2> /dev/null | sort -h"
-# alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# For laptop multi-gpu offloading
-alias nvidia_gpu="DRI_PRIME=1 __NV_PRIME_RENDER_OFFLOAD=1 __GLX_VENDOR_LIBRARY_NAME=nvidia"
-
-# Opinionated defaults
-alias feh="swallow feh --force-aliasing --draw-exif --scale-down --draw-filename"
-alias ffplay="swallow ffplay $@"
-alias shutdown="shutdown -P now"
-alias untar="tar -xvf $@"
-alias cura="cura5 -platformtheme gtk3"
-alias cp="cp -iv"
-alias mv="mv -iv"
-alias rm="rm -vI"
-
-# User lfcd by default (it should exist), fall back
-# to ranger if lfcd isn't found. IDK why you wouldn't
-# have either
-[ -x "$(command -v ranger)"] && alias l=". ranger"
-[ -x "$(command -v lfcd)" ] && alias l="lfcd"
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    alias grep='grep --color=auto'
-fi
-

.xinitrc

@@ -1,8 +1,7 @@
 #!/bin/sh
-x11_home="$XDG_CONFIG_HOME/x11"
 
-userresources=$x11_home/Xresources
-usermodmap=$x11_home/Xmodmap
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap