diff --git a/bin/cave-rdep b/bin/cave-rdep deleted file mode 100755 index dafaffa..0000000 --- a/bin/cave-rdep +++ /dev/null @@ -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) diff --git a/bin/compile-kernel b/bin/compile-kernel deleted file mode 100755 index 0a39113..0000000 --- a/bin/compile-kernel +++ /dev/null @@ -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 diff --git a/bin/force-install b/bin/force-install deleted file mode 100755 index 5296cae..0000000 --- a/bin/force-install +++ /dev/null @@ -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 diff --git a/sbin/sc-0-sync b/bin/sc-0-sync similarity index 100% rename from sbin/sc-0-sync rename to bin/sc-0-sync diff --git a/sbin/sc-01-sync-resolve b/bin/sc-01-sync-resolve similarity index 100% rename from sbin/sc-01-sync-resolve rename to bin/sc-01-sync-resolve diff --git a/sbin/sc-1-resolve b/bin/sc-1-resolve similarity index 100% rename from sbin/sc-1-resolve rename to bin/sc-1-resolve diff --git a/sbin/sc-2-cleanup b/bin/sc-2-cleanup similarity index 89% rename from sbin/sc-2-cleanup rename to bin/sc-2-cleanup index 556944b..3e2fe67 100755 --- a/sbin/sc-2-cleanup +++ b/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} diff --git a/sbin/sc-3-regen b/bin/sc-3-regen similarity index 100% rename from sbin/sc-3-regen rename to bin/sc-3-regen diff --git a/etc/over-env/prompt.cfg b/etc/over/env/prompt.cfg similarity index 100% rename from etc/over-env/prompt.cfg rename to etc/over/env/prompt.cfg diff --git a/etc/screenrc.over b/etc/screenrc.over index fc670db..5a51952 100644 --- a/etc/screenrc.over +++ b/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 - diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 397e153..a3b70ad 100644 --- a/etc/zsh/zshrc +++ b/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 diff --git a/install.sh b/install.sh index f71878d..f47e8af 100755 --- a/install.sh +++ b/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}" + diff --git a/lib/prompt-init b/lib/prompt-init index d73e83c..03378c2 100755 --- a/lib/prompt-init +++ b/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" diff --git a/locale/en_OV b/locale/en_AG similarity index 85% rename from locale/en_OV rename to locale/en_AG index 9669df7..18850e0 100644 --- a/locale/en_OV +++ b/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 "" +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"