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.

diff --git a/base/.Xresources b/base/.Xresources
index e5ca679470705428a1b769aee60bed38fe408570..3f56cd45d997ba67303dda759e652bec7223915f 100644 (file)
--- 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
 #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
 #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
 #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
 *color0:                  S_base02
 *color8:                  S_base03

-! red dark/light
+! red

 *color1:                  S_red
 *color9:                  S_orange
 *color1:                  S_red
 *color9:                  S_orange

-! green dark/light
+! green

 *color2:                  S_green
 *color10:                 S_base01
 *color2:                  S_green
 *color10:                 S_base01

-! yellow dark/light
+! yellow

 *color3:                  S_yellow
 *color11:                 S_base00
 *color3:                  S_yellow
 *color11:                 S_base00

-! blue dark/light
+! blue

 *color4:                  S_blue
 *color12:                 S_base0
 *color4:                  S_blue
 *color12:                 S_base0

-! magenta dark/light
+! magenta

 *color5:                  S_magenta
 *color13:                 S_violet
 *color5:                  S_magenta
 *color13:                 S_violet

-! cyan dark/light
+! cyan

 *color6:                  S_cyan
 *color14:                 S_base1
 *color6:                  S_cyan
 *color14:                 S_base1

-! white dark/light
+! white

 *color7:                  S_base2
 *color15:                 S_base3
 *color7:                  S_base2
 *color15:                 S_base3

-! underline
-*underlineColor:          S_yellow
-

 
 ! URxvt
 URxvt.termName:           rxvt-unicode-256color
 
 ! URxvt
 URxvt.termName:           rxvt-unicode-256color

diff --git a/base/.zshenv b/base/.zshenv
index 8add8171a4e0ec591f08f695309be4565d320f9b..58169bc8c0301e47f4b6d685c4c024d1aad779ed 100644 (file)
--- 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))
           /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[@]}")
     # take another backup, explained in .zprofile
     typeset -U _backup_path
     _backup_path=("${path[@]}")

diff --git a/install.sh b/install.sh
index 886eb1ec916b4bbe5acd503d48a2bf6336d14c18..85774a03ecb82e4f8524ff0086220a43eea0cfa2 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -21,7 +21,8 @@ fi
 
 # create preferred folder structure
 cd ~
 
 # 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
 
 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
                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
 done

diff --git a/termux/colors.properties b/termux/colors.properties
new file mode 100644 (file)
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 (file)
index 0000000..608f755
--- /dev/null
+++ b/termux/termux.properties
@@ -0,0 +1,3 @@
+fullscreen = true
+use-fullscreen-workaround = true
+extra-keys = []