- removed old Gentoo-specific scripts

- merged sbin into bin
- new locale en_AG

bin/cave-rdep

@@ -1,71 +0,0 @@
-#! /usr/bin/env python3
-# encoding: utf-8
-
-import glob
-import re
-import sys
-
-def is_a_version(token):
-	"""
-	Returns True iff token is a portage version spec (i.e. contains only numbers or ".").
-	"""
-	
-	for A in token:
-		a = ord(A)
-		if not (0x30 <= a <= 0x39 or a == 0x2e):
-			return False
-	
-	return True
-
-def strip_version(atom):
-	"""
-	Removes the =version-123 spec from a portage atom.
-	
-	Works like 99% of the time. Good enough for the girls I go out with.
-	"""
-	
-	parts = atom[1:].split("-")
-	wanted = []
-	
-	for part in parts:
-		if is_a_version(part):
-			break
-		
-		wanted.append(part)
-	
-	return "-".join(wanted)
-
-def grep(exp, filename):
-	with open(filename) as f:
-		matches = re.findall(exp, f.read())
-	
-	return matches
-
-def find_reverse_deps(deps, version=True):
-	all_dep_files = glob.glob("/var/db/pkg/*/*/*DEPEND")
-	
-	regexp = "(%s)[^:]*:[^/]+/[^=]+=" %("|".join(deps))
-	matching_files = set(f for f in all_dep_files if grep(regexp, f))
-	atoms = {"=" + f[12:].rsplit("/", 1)[0] for f in matching_files}
-	
-	if not version:
-		atoms = {strip_version(a) for a in atoms}
-	
-	return atoms
-
-if __name__ == "__main__":
-	if len(sys.argv) > 1:
-		if sys.argv[1] == "-v":
-			version = False
-			targets = sys.argv[2:]
-		else:
-			version = True
-			targets = sys.argv[1:]
-		
-		atoms = find_reverse_deps(targets, version)
-		print(" ".join(sorted(atoms)))
-	else:
-		print("Usage: %s DEPENDENCY [more DEPENDENCIES...]" %(sys.argv[0]))
-		print("Finds all reverse deps of DEPENDENCY")
-		
-		sys.exit(1)

bin/compile-kernel

@@ -1,18 +0,0 @@
-#! /bin/bash
-
-KERNEL_UPDATE_CMD="cave resolve --preserve-world --lazy kernel-modules"
-
-buildkernel --ask --verbose && \
-$KERNEL_UPDATE_CMD
-
-echo -n '>>> Type "yes" to do the above. '
-read Q
-
-if [[ $Q == "yes" ]]; then
-	echo ">>> Executing."
-	$KERNEL_UPDATE_CMD -x
-	
-	if [[ -d /usr/lib64/opengl/nvidia ]]; then
-		rm -f /opt/bin/nvidia-* /usr/bin/nvidia-*
-	fi
-fi

bin/force-install

@@ -1,19 +0,0 @@
-#! /bin/zsh
-# encoding: utf-8
-
-for arg in $@
-do
-	if [[ "$arg" =~ "::" ]]; then
-		suffix=""
-	else
-		suffix="::gentoo"
-	fi
-	
-	cave perform fetch "${arg}${suffix}" && \
-	cave perform install --destination installed "${arg}${suffix}"
-	
-	if [[ $? -eq 1 ]]; then
-		echo "!!! failed during $arg"
-		exit 1
-	fi
-done

bin/sc-2-cleanup

@@ -12,4 +12,4 @@ if [[ $Q == "yes" ]]; then
 	cave purge --complete -x
 fi
 
-cave fix-linkage $1
+cave fix-linkage ${1}

etc/screenrc.over

@@ -1,29 +1,4 @@
-defutf8 on
-autodetach on
-startup_message off
-defscrollback 10240
-
-# scroll through scrollback
-termcapinfo xterm* ti@:te@
-
-# use current bg color for erased chars
-defbce on
-
-# remapping dangerous keybindings
-bind k
-bind ^k
-bind .
-bind ^\
-bind \\
-bind ^h
-bind h
-bind 'K' kill
-bind 'I' login on
-bind 'O' login off
-bind '}' history
-
-# drop scrollback command
-bind '/' eval "scrollback 0" "scrollback 15000"
+source /etc/screenrc
 
 # my preferred default windows
 screen  0 sudo su -

etc/zsh/zshrc

@@ -21,7 +21,7 @@ alias Ytune="noglob youtube-dl --no-check-certificate -x --audio-format vorbis -
 alias units="units -v"
 alias usystemctl="systemctl --user"
 alias battery="upower -i /org/freedesktop/UPower/devices/battery_BAT0"
-alias pp=python
+alias pp=python2
 alias ppp=python3
 
 # apparently this is the only way of setting GNU Screen to UTF-8

install.sh

@@ -2,8 +2,19 @@
 
 ROOT="${1}"
 LIBDIR="${ROOT}/usr/lib/over/env"
+BINDIR="${ROOT}/usr/bin"
+CFGDIR="${ROOT}/etc"
+LOCALEDIR="${ROOT}/usr/share/i18n/locales"
+
+mkdir -p "${BINDIR}"
+cp bin/* "${BINDIR}"
 
 mkdir -p "${LIBDIR}"
 cp lib/* "${LIBDIR}"
-mkdir -p "${ROOT}/etc"
-cp -r etc/* "${ROOT}/etc"
+
+mkdir -p "${CFGDIR}"
+cp -r etc/* "${CFGDIR}"
+
+mkdir -p "${LOCALEDIR}"
+cp locale/* "${LOCALEDIR}"
+

lib/prompt-init

@@ -1,6 +1,6 @@
 #! /bin/zsh
 
-OVER_PROMPT_CFG="/etc/over-env/prompt.cfg"
+OVER_PROMPT_CFG="/etc/over/env/prompt.cfg"
 
 if [[ -a "$OVER_PROMPT_CFG" ]]; then
 	source "$OVER_PROMPT_CFG"

locale/en_AG

@@ -2,7 +2,7 @@ escape_char /
 comment_char %
 
 LC_IDENTIFICATION
-title      "Overwatch English locale"
+title      "Aggregate English locale"
 source     ""
 address    ""
 contact    ""
@@ -12,20 +12,20 @@ fax        ""
 language   "English"
 territory  "Tellus"
 revision   "1.0"
-date       "2015-10-04"
+date       "2018-12-08"
 %
-category  "en_OV:2000";LC_IDENTIFICATION
-category  "en_OV:2000";LC_CTYPE
-category  "en_OV:2000";LC_COLLATE
-category  "en_OV:2000";LC_TIME
-category  "en_OV:2000";LC_NUMERIC
-category  "en_OV:2000";LC_MONETARY
-category  "en_OV:2000";LC_MESSAGES
-category  "en_OV:2000";LC_PAPER
-category  "en_OV:2000";LC_NAME
-category  "en_OV:2000";LC_ADDRESS
-category  "en_OV:2000";LC_TELEPHONE
-category  "en_OV:2000";LC_MEASUREMENT
+category  "en_AG:2000";LC_IDENTIFICATION
+category  "en_AG:2000";LC_CTYPE
+category  "en_AG:2000";LC_COLLATE
+category  "en_AG:2000";LC_TIME
+category  "en_AG:2000";LC_NUMERIC
+category  "en_AG:2000";LC_MONETARY
+category  "en_AG:2000";LC_MESSAGES
+category  "en_AG:2000";LC_PAPER
+category  "en_AG:2000";LC_NAME
+category  "en_AG:2000";LC_ADDRESS
+category  "en_AG:2000";LC_TELEPHONE
+category  "en_AG:2000";LC_MEASUREMENT
 END LC_IDENTIFICATION
 
 LC_CTYPE
@@ -40,8 +40,8 @@ copy "iso14651_t1"
 END LC_COLLATE
 
 LC_MONETARY
-int_curr_symbol     "BTC "
-currency_symbol     "<U0E3F>"
+int_curr_symbol     "EUR "
+currency_symbol     "€"
 mon_decimal_point   "."
 mon_thousands_sep   " "
 mon_grouping        3;3
@@ -77,7 +77,7 @@ abmon "Jan";"Feb";"Mar";"Apr";"May";"Jun";"Jul";"Aug";"Sep";"Oct";"Nov";"Dec"
 mon "January";"February";"March";"April";"May";"June";"July";"August";"September";"October";"November";"December"
 
 % Appropriate date and time representation (%c)
-d_t_fmt "%a %Y-%m-%d %H:%M:%S %z"
+d_t_fmt "%a %Y-%m-%d %H:%M:%S %Z"
 %
 % Appropriate date representation (%x)
 d_fmt   "%Y-%m-%d"