From de9f9234f1116d9f3f203e3d0aa426a3fd2f8d25 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@rak.ac>
Date: Wed, 27 Dec 2023 17:53:18 -0500
Subject: Order the sourced common shell files

---
 dot_config/sh/02_xdg-base-dirs |  4 ++++
 dot_config/sh/03_locale        | 10 +++++++++
 dot_config/sh/10_aliases       | 49 ++++++++++++++++++++++++++++++++++++++++++
 dot_config/sh/aliases          | 49 ------------------------------------------
 dot_config/sh/locale           | 10 ---------
 dot_config/sh/xdg-base-dirs    |  4 ----
 6 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 dot_config/sh/02_xdg-base-dirs
 create mode 100644 dot_config/sh/03_locale
 create mode 100644 dot_config/sh/10_aliases
 delete mode 100644 dot_config/sh/aliases
 delete mode 100644 dot_config/sh/locale
 delete mode 100644 dot_config/sh/xdg-base-dirs

diff --git a/dot_config/sh/02_xdg-base-dirs b/dot_config/sh/02_xdg-base-dirs
new file mode 100644
index 0000000..18acb96
--- /dev/null
+++ b/dot_config/sh/02_xdg-base-dirs
@@ -0,0 +1,4 @@
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_STATE_HOME="${HOME}/.local/state"
diff --git a/dot_config/sh/03_locale b/dot_config/sh/03_locale
new file mode 100644
index 0000000..f9dda6c
--- /dev/null
+++ b/dot_config/sh/03_locale
@@ -0,0 +1,10 @@
+if ! export LANG=$(locale -a | grep -E -i "en_CA.UTF-?8"); then
+    if ! export LANG=$(locale -a | grep -E -i "C.UTF-?8"); then
+        export LANG=C
+    fi
+fi
+
+export LC_TIME="en_GB.UTF-8"
+export LC_COLLATE=C                     # force strict lexicographic sorting
+
+# vim: set ft=sh:
diff --git a/dot_config/sh/10_aliases b/dot_config/sh/10_aliases
new file mode 100644
index 0000000..f96d5d7
--- /dev/null
+++ b/dot_config/sh/10_aliases
@@ -0,0 +1,49 @@
+alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade'
+
+alias 1920s='mplayer -playlist http://kara.fast-serv.com:8398/listen.pls'
+alias dismuke='mplayer -playlist https://early1900s.org/radiodismuke/radiodismuke.pls'
+alias wzum='mplayer http://pubmusic.streamguys1.com/wzum-aac'
+
+alias mplayer-fb='mplayer -vo fbdev'
+alias links2-fb='links2 -driver fb'
+
+alias itp='reportbug -M -B debian --email rak@debian.org --paranoid -K $GPGKEY wnpp'
+alias gibuild='gbp buildpackage --git-builder="sbuild -sAd u"'
+alias gibuildi='gbp buildpackage --git-ignore-new --git-builder="sbuild -sAd u"'
+alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
+
+alias vi='vim'
+
+alias sm='tmux attach -t mail || tmux -f ${HOME}/.tmux-mail.conf attach -t mail'
+alias sshfw='ssh -oForwardAgent=yes'
+
+alias llocate="locate -d ${XDG_STATE_HOME}/plocate/home.db"
+
+# Alias/custom commands
+#
+# Many of these options don's exist on BSD rm/cp/mkdir/ln/etc.
+#
+# Some are just in case - for 'rm', 'cp' and 'mv' - ask about overwriting or
+# deleting files.
+# Furthermore, be verbose about what each command is performing to be present of
+# what is occuring every time.
+if [[ `uname` = "Linux" ]]; then
+    alias cp="cp -iv"
+    alias mkdir="mkdir -v"
+    alias mv="mv -iv"
+    alias ln="ln -v"
+    # Only delete files on the current file system to avoid removing recursively
+    # from bind mounts.
+    alias rm="rm -iv --one-file-system"
+
+    alias grep="grep --colour=auto"
+
+    alias chown="chown -v"
+    alias chmod="chmod -v"
+    alias ls="ls --classify --color=always" # Add all colours and
+                                            # have fancy symbols for files, etc.
+elif [[ `uname` = "OpenBSD" && -x /usr/local/bin/colorls ]]; then
+    alias ls="colorls -G"
+fi
+
+# vim: set ft=sh:
diff --git a/dot_config/sh/aliases b/dot_config/sh/aliases
deleted file mode 100644
index f96d5d7..0000000
--- a/dot_config/sh/aliases
+++ /dev/null
@@ -1,49 +0,0 @@
-alias apt-upgrade='sudo apt-get update && sudo apt-get dist-upgrade'
-
-alias 1920s='mplayer -playlist http://kara.fast-serv.com:8398/listen.pls'
-alias dismuke='mplayer -playlist https://early1900s.org/radiodismuke/radiodismuke.pls'
-alias wzum='mplayer http://pubmusic.streamguys1.com/wzum-aac'
-
-alias mplayer-fb='mplayer -vo fbdev'
-alias links2-fb='links2 -driver fb'
-
-alias itp='reportbug -M -B debian --email rak@debian.org --paranoid -K $GPGKEY wnpp'
-alias gibuild='gbp buildpackage --git-builder="sbuild -sAd u"'
-alias gibuildi='gbp buildpackage --git-ignore-new --git-builder="sbuild -sAd u"'
-alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
-
-alias vi='vim'
-
-alias sm='tmux attach -t mail || tmux -f ${HOME}/.tmux-mail.conf attach -t mail'
-alias sshfw='ssh -oForwardAgent=yes'
-
-alias llocate="locate -d ${XDG_STATE_HOME}/plocate/home.db"
-
-# Alias/custom commands
-#
-# Many of these options don's exist on BSD rm/cp/mkdir/ln/etc.
-#
-# Some are just in case - for 'rm', 'cp' and 'mv' - ask about overwriting or
-# deleting files.
-# Furthermore, be verbose about what each command is performing to be present of
-# what is occuring every time.
-if [[ `uname` = "Linux" ]]; then
-    alias cp="cp -iv"
-    alias mkdir="mkdir -v"
-    alias mv="mv -iv"
-    alias ln="ln -v"
-    # Only delete files on the current file system to avoid removing recursively
-    # from bind mounts.
-    alias rm="rm -iv --one-file-system"
-
-    alias grep="grep --colour=auto"
-
-    alias chown="chown -v"
-    alias chmod="chmod -v"
-    alias ls="ls --classify --color=always" # Add all colours and
-                                            # have fancy symbols for files, etc.
-elif [[ `uname` = "OpenBSD" && -x /usr/local/bin/colorls ]]; then
-    alias ls="colorls -G"
-fi
-
-# vim: set ft=sh:
diff --git a/dot_config/sh/locale b/dot_config/sh/locale
deleted file mode 100644
index f9dda6c..0000000
--- a/dot_config/sh/locale
+++ /dev/null
@@ -1,10 +0,0 @@
-if ! export LANG=$(locale -a | grep -E -i "en_CA.UTF-?8"); then
-    if ! export LANG=$(locale -a | grep -E -i "C.UTF-?8"); then
-        export LANG=C
-    fi
-fi
-
-export LC_TIME="en_GB.UTF-8"
-export LC_COLLATE=C                     # force strict lexicographic sorting
-
-# vim: set ft=sh:
diff --git a/dot_config/sh/xdg-base-dirs b/dot_config/sh/xdg-base-dirs
deleted file mode 100644
index 18acb96..0000000
--- a/dot_config/sh/xdg-base-dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-export XDG_CACHE_HOME="${HOME}/.cache"
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_DATA_HOME="${HOME}/.local/share"
-export XDG_STATE_HOME="${HOME}/.local/state"
-- 
cgit v1.2.3