Merge remote-tracking branch 'LukeSmithxyz/master'

.config/nvim/init.vim

@@ -57,6 +57,9 @@ set clipboard+=unnamedplus
 	map <C-k> <C-w>k
 	map <C-l> <C-w>l
 
+" Replace ex mode with gq
+	map Q gq
+
 " Check file in shellcheck:
 	map <leader>s :!clear && shellcheck %<CR>
 

.config/user-dirs.dirs

@@ -1,2 +1,4 @@
 XDG_DESKTOP_DIR="$HOME/"
 XDG_DOWNLOAD_DIR="$HOME/downloads"
+XDG_CONFIG_HOME="$HOME/.config"
+XDG_DATA_HOME="$HOME/.local/share"

.local/bin/lmc

@@ -10,11 +10,13 @@ if [ "$PULSE" ]; then
 	mute() { pulsemixer --mute ;}
 	up() { pulsemixer --change-volume +"$NUM" ;}
 	down() { pulsemixer --change-volume -"$NUM" ;}
+	control() { pulsemixer ;}
 else
 	toggle() { amixer sset Master toggle ;}
 	mute() { amixer sset Master mute ;}
 	up() { amixer sset Master "$NUM"%+ ;}
 	down() { amixer sset Master "$NUM"%- ;}
+	control() { alsamixer ;}
 fi
 
 case "$1" in
@@ -22,6 +24,7 @@ case "$1" in
 	mute) mute ;;
 	up) up ;;
 	down) down ;;
-esac >/dev/null
+	control) control ;;
+esac
 
 pkill -RTMIN+10 "${STATUSBAR:?}" &

.profile

@@ -11,8 +11,10 @@ export READER="zathura"
 export FILE="ranger"
 export STATUSBAR="polybar"
 
+# Export XDG environmental variables from '~/.config/user-dirs.dirs'
+eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)"
+
 # ~/ Clean-up:
-export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs.
 export NOTMUCH_CONFIG="$HOME/.config/notmuch-config"
 export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0"
 export LESSHISTFILE="-"