From 1118e1eeb0440e0058c0840588e9afdd54f709ea Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Wed, 3 Mar 2021 02:35:53 -0600
Subject: [PATCH] add termux, organize .Xresources, export FPATH

a side-effect of a the FPATH cleanup and fixes is that the export was
removed for it. PATH is automatically flagged for export by default, but
FPATH is not, so it must be exported to survive subshells.
---
 base/.Xresources         | 33 +++++++++++++++------------------
 base/.zshenv             |  3 ++-
 install.sh               |  9 ++++++---
 termux/colors.properties | 29 +++++++++++++++++++++++++++++
 termux/termux.properties |  3 +++
 5 files changed, 55 insertions(+), 22 deletions(-)
 create mode 100644 termux/colors.properties
 create mode 100644 termux/termux.properties

diff --git a/base/.Xresources b/base/.Xresources
index e5ca679..3f56cd4 100644
--- a/base/.Xresources
+++ b/base/.Xresources
@@ -22,13 +22,6 @@ Xcursor.theme:            Paper-Mono-Dark
 #define S_base1           #93a1a1
 #define S_base2           #eee8d5
 #define S_base3           #fdf6e3
-*background:              S_base03
-*foreground:              S_base0
-*fadeColor:               S_base03
-*cursorColor:             S_base1
-*pointerColorBackground:  S_base01
-*pointerColorForeground:  S_base1
-
 #define S_yellow          #b58900
 #define S_orange          #cb4b16
 #define S_red             #dc322f
@@ -38,33 +31,37 @@ Xcursor.theme:            Paper-Mono-Dark
 #define S_cyan            #2aa198
 !#define S_green           #859900
 #define S_green           #85c000
-! black dark/light
+*background:              S_base03
+*foreground:              S_base0
+*fadeColor:               S_base03
+*cursorColor:             S_base1
+*pointerColorBackground:  S_base01
+*pointerColorForeground:  S_base1
+*underlineColor:          S_yellow
+! black
 *color0:                  S_base02
 *color8:                  S_base03
-! red dark/light
+! red
 *color1:                  S_red
 *color9:                  S_orange
-! green dark/light
+! green
 *color2:                  S_green
 *color10:                 S_base01
-! yellow dark/light
+! yellow
 *color3:                  S_yellow
 *color11:                 S_base00
-! blue dark/light
+! blue
 *color4:                  S_blue
 *color12:                 S_base0
-! magenta dark/light
+! magenta
 *color5:                  S_magenta
 *color13:                 S_violet
-! cyan dark/light
+! cyan
 *color6:                  S_cyan
 *color14:                 S_base1
-! white dark/light
+! white
 *color7:                  S_base2
 *color15:                 S_base3
-! underline
-*underlineColor:          S_yellow
-
 
 ! URxvt
 URxvt.termName:           rxvt-unicode-256color
diff --git a/base/.zshenv b/base/.zshenv
index 8add817..58169bc 100644
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -24,7 +24,8 @@ if [[ -v _sev_reset_shell || $SHLVL == 1 ]] {
           /usr/local/{s,}bin /usr/games)
     PATH=$PATH:$_sev_sys_PATH
     fpath=(${ZDOTDIR:-$HOME/.zsh}/functions/{*,Completions/*}(N))
-    FPATH=$FPATH:$_sev_sys_FPATH
+    #fpath is not exported by default
+    export FPATH=$FPATH:$_sev_sys_FPATH
     # take another backup, explained in .zprofile
     typeset -U _backup_path
     _backup_path=("${path[@]}")
diff --git a/install.sh b/install.sh
index 886eb1e..85774a0 100755
--- a/install.sh
+++ b/install.sh
@@ -21,7 +21,8 @@ fi
 
 # create preferred folder structure
 cd ~
-mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes .gnupg .ssh >$devnull 2>&1
+mkdir -p bin etc share share/fonts .urxvt/ext \
+         .icons .themes .gnupg .ssh .termux >$devnull 2>&1
 mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
 cd - >$devnull
 
@@ -78,6 +79,8 @@ if which gpg >/dev/null 2>&1; then
 		gpg --import "$x"
 	done
 fi
-find ssh -mindepth 1 -maxdepth 1 | while read -r x; do
-	l "$HOME/.ssh/`basename "$x"`"
+for y in ssh termux; do
+	find $y -mindepth 1 -maxdepth 1 | while read -r x; do
+		l "$HOME/.$y/`basename "$x"`"
+	done
 done
diff --git a/termux/colors.properties b/termux/colors.properties
new file mode 100644
index 0000000..45b0502
--- /dev/null
+++ b/termux/colors.properties
@@ -0,0 +1,29 @@
+# http://ethanschoonover.com/solarized
+#background = #002b36
+background = #000a0d
+foreground = #839496
+cursor     = #93a1a1
+# black
+color0     = #073642
+color8     = #002b36
+# red
+color1     = #dc322f
+color9     = #cb4b16
+# green
+color2     = #85c000
+color10    = #586e75
+# yellow
+color3     = #b58900
+color11    = #657b83
+# blue
+color4     = #268bd2
+color12    = #839496
+# magenta
+color5     = #d33682
+color13    = #6c71c4
+# cyan
+color6     = #2aa198
+color14    = #93a1a1
+# white
+color7     = #eee8d5
+color15    = #fdf6e3
diff --git a/termux/termux.properties b/termux/termux.properties
new file mode 100644
index 0000000..608f755
--- /dev/null
+++ b/termux/termux.properties
@@ -0,0 +1,3 @@
+fullscreen = true
+use-fullscreen-workaround = true
+extra-keys = []
-- 
2.47.0