complete previous commit

diff --git a/base/.Xresources b/base/.Xresources
index 6e81302bd5afb89468655e05539a99ad4896fae8..f3133d334a804afae9614b4b71662b5f1c72f37b 100644 (file)
--- a/base/.Xresources
+++ b/base/.Xresources
@@ -1,5 +1,5 @@
 ! fonts
-*font:                    -windows-dina-medium-r-*-*-13-80-*-*-*-*-*
+*font:                    -windows-dina-medium-r-*-*-10-80-*-*-*-*-*
 *faceName:                Dina
 *faceSize:                8
 Xft.antialias:            true

diff --git a/base/.xinitrc b/base/.xinitrc
index 838c1e9a4b592641ae369eb7b6d92da1fe818269..fc4bbb57a8f61f13a85c422aa0f6ed11ca14841f 100644 (file)
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -27,7 +27,10 @@ xset r rate 290 26 &
 xset m 1/1 0 &
 xset s off
 xset dpms 0 0 600
-xset +fp ${XDG_DATA_HOME:-~/share}/fonts/Dina/
+
+find -L "${XDG_DATA_HOME:-~/share}/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       xset +fp $x/
+done
 xset fp rehash
 
 # root terminal

diff --git a/base/.zshenv b/base/.zshenv
index 7c2fe94acf70f037d857259e948f3954ef85228b..cae4b34b246a4d09f9d188fdfb04bb2bc931f99c 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,5 +1,4 @@
 ### path
-# typeset -U makes every array entry unique
 # /usr/{pkg,local,games} are unix/bsdisms
 typeset -U path
 path=({~/,/,/usr/}sbin {~/,/,/usr/}bin /usr/pkg/{s,}bin /usr/X11R{7,6}/bin
@@ -16,15 +15,14 @@ export LC_CTYPE="$LANG"
 export XDG_CONFIG_HOME=~/etc
 export XDG_CONFIG_DIRS=~/.config:/usr/pkg/etc/xdg:/usr/local/etc/xdg:/etc/xdg
 export XDG_DATA_HOME=~/share
-export XDG_DATA_DIRS=~/.local/share/:/usr/pkg/share/:/usr/local/share/:/usr/share/
+export XDG_DATA_DIRS=~/.local/share:/usr/pkg/share:/usr/local/share:/usr/share
 export XDG_CACHE_HOME=~/tmp
 
 ### applications
-export DVTM_TERM=rxvt-unicode
 export PYTHONSTARTUP=~/.pythonrc
 
 ### freebsd
-if [[ "$OSTYPE" = "freebsd" ]]; then
+if [[ "$OSTYPE" =~ "^freebsd" ]]; then
        export CLICOLOR=
        export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
 fi

diff --git a/base/.zshrc b/base/.zshrc
index 2dd25ff460a284c708a9b6767d9f7cbf921c7062..3fdaa0d419152e350c33277e4ad04db7baff5836 100644 (file)
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -52,7 +52,7 @@ if [[ "$OSTYPE" =~ '^freebsd' ]] {
 ### prompt
 setopt prompt_subst
 local f=
-if [[ "$OSTYPE" = "netbsd" && ( "$TERM" = "wsvt25" || "$TERM" =~ '^vt' ) ]] {
+if [[ "$OSTYPE" = "netbsd" && ( "$TERM" =~ "^wsvt" || "$TERM" =~ '^vt' ) ]] {
     # fix for wscons
     f="%F{white}"
 } else {

diff --git a/install.sh b/install.sh
index e5ccd5f77ca8902157fad5a7e23e675cc0463963..2d244b1c5e8a926ea0d6cbc5d104b24a29de54ef 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
+
 # test
-if [ 0 -eq 1 ]; then
+if [ "$1" = "test" ]; then
        mkdir() { echo -- "$*"; }
        alias ln="echo ln"
        alias rm="echo rm"
@@ -11,7 +13,7 @@ fi
 
 # create preferred folder structure
 cd ~
-mkdir -p bin etc share .urxvt/ext .icons .themes > /dev/null 2>&1
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes > /dev/null 2>&1
 mkdir -pm 700 var/tmp var/tmp/vim > /dev/null 2>&1
 cd -
 
@@ -24,7 +26,7 @@ fi
 case "$OSTYPE" in
        # TODO: make links safer for systems without -Fw
        freebsd*)               lnargs=-sFhvw;;
-       netbsd*|openbsd*)       lnargs=-sfhv;;
+       netbsd|openbsd*)        lnargs=-sfhv;;
        # android busybox find doesn't have -executable
        android)                fex=-executable;;
 esac
@@ -42,15 +44,21 @@ find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/$x" "$PWD/$x"
 done
 find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
-       l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"
+       l "$HOME/etc/`basename "$x"`"
 done
 find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
        l "$HOME/.urxvt/ext/`basename $x`"
 done
-find "$PWD/xorg" -type d -mindepth 3 -maxdepth 3 | while read -r x; do
-       l "$HOME/.icons/`basename $x`"
+cd "$PWD/xorg"
+for y in icons themes; do
+       find $y -type d -mindepth 2 -maxdepth 2 | while read -r x; do
+               l "$HOME/.$y/`basename "$x"`" "$PWD/$x"
+       done
+done
+cd -
+find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/share/fonts/`basename "$x"`"
 done
-#TODO: theme
 
 cd ~
 if [ "$OSTYPE" = "freebsd" ]; then

diff --git a/xorg/fonts/Dina/.uuid b/xorg/fonts/Dina/.uuid
new file mode 100644 (file)
index 0000000..ce8f290
--- /dev/null
+++ b/xorg/fonts/Dina/.uuid
@@ -0,0 +1 @@
+2feb4c3f-0a63-475e-99a3-fcb3dd2c7cdb
\ No newline at end of file

diff --git a/xorg/fonts/Dina/Dina_i400-10.pcf.gz b/xorg/fonts/Dina/Dina_i400-10.pcf.gz
new file mode 100644 (file)
index 0000000..cf53b5e
Binary files /dev/null and b/xorg/fonts/Dina/Dina_i400-10.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_i400-8.pcf.gz b/xorg/fonts/Dina/Dina_i400-8.pcf.gz
new file mode 100644 (file)
index 0000000..f289553
Binary files /dev/null and b/xorg/fonts/Dina/Dina_i400-8.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_i400-9.pcf.gz b/xorg/fonts/Dina/Dina_i400-9.pcf.gz
new file mode 100644 (file)
index 0000000..1841d03
Binary files /dev/null and b/xorg/fonts/Dina/Dina_i400-9.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_i700-10.pcf.gz b/xorg/fonts/Dina/Dina_i700-10.pcf.gz
new file mode 100644 (file)
index 0000000..f4959dc
Binary files /dev/null and b/xorg/fonts/Dina/Dina_i700-10.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_i700-8.pcf.gz b/xorg/fonts/Dina/Dina_i700-8.pcf.gz
new file mode 100644 (file)
index 0000000..933dad9
Binary files /dev/null and b/xorg/fonts/Dina/Dina_i700-8.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_i700-9.pcf.gz b/xorg/fonts/Dina/Dina_i700-9.pcf.gz
new file mode 100644 (file)
index 0000000..9b2c6b4
Binary files /dev/null and b/xorg/fonts/Dina/Dina_i700-9.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_r400-10.pcf.gz b/xorg/fonts/Dina/Dina_r400-10.pcf.gz
new file mode 100644 (file)
index 0000000..4dd7e4c
Binary files /dev/null and b/xorg/fonts/Dina/Dina_r400-10.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_r400-6.pcf.gz b/xorg/fonts/Dina/Dina_r400-6.pcf.gz
new file mode 100644 (file)
index 0000000..9c6ad4b
Binary files /dev/null and b/xorg/fonts/Dina/Dina_r400-6.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_r400-8.pcf.gz b/xorg/fonts/Dina/Dina_r400-8.pcf.gz
new file mode 100644 (file)
index 0000000..9e8ca46
Binary files /dev/null and b/xorg/fonts/Dina/Dina_r400-8.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_r400-9.pcf.gz b/xorg/fonts/Dina/Dina_r400-9.pcf.gz
new file mode 100644 (file)
index 0000000..92554d0
Binary files /dev/null and b/xorg/fonts/Dina/Dina_r400-9.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_r700-10.pcf.gz b/xorg/fonts/Dina/Dina_r700-10.pcf.gz
new file mode 100644 (file)
index 0000000..3a01a3c
Binary files /dev/null and b/xorg/fonts/Dina/Dina_r700-10.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_r700-8.pcf.gz b/xorg/fonts/Dina/Dina_r700-8.pcf.gz
new file mode 100644 (file)
index 0000000..9824374
Binary files /dev/null and b/xorg/fonts/Dina/Dina_r700-8.pcf.gz differ

diff --git a/xorg/fonts/Dina/Dina_r700-9.pcf.gz b/xorg/fonts/Dina/Dina_r700-9.pcf.gz
new file mode 100644 (file)
index 0000000..2c1f6be
Binary files /dev/null and b/xorg/fonts/Dina/Dina_r700-9.pcf.gz differ

diff --git a/xorg/fonts/Dina/fonts.dir b/xorg/fonts/Dina/fonts.dir
new file mode 100644 (file)
index 0000000..f2e6377
--- /dev/null
+++ b/xorg/fonts/Dina/fonts.dir
@@ -0,0 +1,14 @@
+13
+Dina_i400-10.pcf.gz -windows-dina-medium-i-normal--13-100-96-96-c-80-microsoft-cp1252
+Dina_i400-8.pcf.gz -windows-dina-medium-i-normal--10-80-96-96-c-70-microsoft-cp1252
+Dina_i400-9.pcf.gz -windows-dina-medium-i-normal--12-90-96-96-c-70-microsoft-cp1252
+Dina_i700-10.pcf.gz -windows-dina-bold-i-normal--13-100-96-96-c-80-microsoft-cp1252
+Dina_i700-8.pcf.gz -windows-dina-bold-i-normal--10-80-96-96-c-70-microsoft-cp1252
+Dina_i700-9.pcf.gz -windows-dina-bold-i-normal--12-90-96-96-c-70-microsoft-cp1252
+Dina_r400-10.pcf.gz -windows-dina-medium-r-normal--13-100-96-96-c-80-microsoft-cp1252
+Dina_r400-6.pcf.gz -windows-dina-medium-r-normal--8-60-96-96-c-60-microsoft-cp1252
+Dina_r400-8.pcf.gz -windows-dina-medium-r-normal--10-80-96-96-c-70-microsoft-cp1252
+Dina_r400-9.pcf.gz -windows-dina-medium-r-normal--12-90-96-96-c-70-microsoft-cp1252
+Dina_r700-10.pcf.gz -windows-dina-bold-r-normal--13-100-96-96-c-80-microsoft-cp1252
+Dina_r700-8.pcf.gz -windows-dina-bold-r-normal--10-80-96-96-c-70-microsoft-cp1252
+Dina_r700-9.pcf.gz -windows-dina-bold-r-normal--12-90-96-96-c-70-microsoft-cp1252

diff --git a/xorg/fonts/Dina/fonts.scale b/xorg/fonts/Dina/fonts.scale
new file mode 100644 (file)
index 0000000..573541a
--- /dev/null
+++ b/xorg/fonts/Dina/fonts.scale
@@ -0,0 +1 @@
+0