config

commit eac65c7a8ada6a80b20d63cb040f0a3558d05d4a
parent 7777c3765003dea16a0a3ef295c4a2ea96332cba
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date:   Thu, 25 Mar 2021 22:15:44 -0700

Remove many unneeded environ(7) variables

I'm going to be using XDG directories rather than a variable for
each program for sanity.

Diffstat:
M
local/bin/.local/bin/snap
 | 
10
++++++----
M
local/ksh/.config/ksh.kshrc
 | 
2
+-
M
local/profile/.profile
 | 
5
-----
M
local/shell/.config/shell/main
 | 
4
++--

4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/local/bin/.local/bin/snap b/local/bin/.local/bin/snap
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/sh -e
 # Copyright 2021 Jacob R. Edwards
 # License: GPLv3
 #
 # snap -- screenshot to dated file
 #
-# As it's merely a wrapper around maim(1) it's usage is the same.
+# Usage the same as maim(1)
 
-path="${SNAP_DIR-.}/`date +%F/%H.%M.%S`.ff"
-mkdir -p `dirname $path` && maim $* -f png | png2ff >$path && echo $path
+path="${XDG_DATA_DIR:-$HOME/.local/share}/$(basename $0)/$(date +%F/%H-%M-%S).ff"
+mkdir -p "$(dirname $path)"
+maim "$@" -f png | png2ff >"$path"
+echo "$path"
diff --git a/local/ksh/.config/ksh.kshrc b/local/ksh/.config/ksh.kshrc
@@ -2,7 +2,7 @@
 
 set -Xabh -o vi
 
-test -f $SHELL_MODULE_DIR/main && . $SHELL_MODULE_DIR/main
+test -f "$XDG_CONFIG_HOME/shell/main" && . "$XDG_CONFIG_HOME/shell/main"
 test -f $XDG_CONFIG_HOME/dalias &&
 	eval $(awk -F'\t' '{ printf "alias -d %s=%s;", $1, $3 }' \
 	<$XDG_CONFIG_HOME/dalias)
diff --git a/local/profile/.profile b/local/profile/.profile
@@ -20,7 +20,6 @@ export XDG_DATA_HOME="$HOME/local/share/"
 
 # etc
 export CDPATH=".:$HOME/own:$HOME/.local"
-export DICT_DIR="$HOME/.local/share/wdef/"
 export ENV="$XDG_CONFIG_HOME/ksh.kshrc"
 export HISTBASE="$HOME/.local/var"
 export INPUTRC="$XDG_CONFIG_HOME/readline"
@@ -36,8 +35,4 @@ export PATH="$HOME/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/l
 export PREFIX="/usr/local/"
 export PWDLOG="$HOME/.local/var/log/pwd"
 export SHELL_MODULES="aliases cd etc fs hist mpc openbsd private xorg"
-export SHELL_MODULE_DIR=$XDG_CONFIG_HOME/shell
-export SNAP_DIR="$HOME/own/graphics/bitmap/screenshots/"
-export THESAURUS_DIR="$HOME/.local/share/walt/"
-export URL_DIR="$HOME/.local/var/bookmarks/"
 export WALLPAPER_DIR="$HOME/image/wallpapers/"
diff --git a/local/shell/.config/shell/main b/local/shell/.config/shell/main
@@ -3,10 +3,10 @@
 include() {
 	for module in "$@"
 	do
-		local include="${SHELL_MODULE_DIR:?unset}/$module"
+		local include="${XDG_CONFIG_HOME:-$HOME/.config}/shell/$module"
 		test -f "$include" || {
 			printf 'include: '%s': No such file or directory.\n' \
-				$include 1>&2;
+				$include 1>&2
 			continue
 		}
 		. "$include"