feh/keys: Add, (Vi-like) mappings for feh.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index e0c0b5fe33936fb8face1dafb3f6817c57bf55bf..2dc16935fca9588f90882fd30139316d6cb49800 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -2,6 +2,21 @@
 
 # Setup script for X11 configuration files.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 . ../lib.sh
 
@@ -9,12 +24,13 @@ if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
 if installed xmonad; then
-    link . ~/.xmonad
+    link xmonad ~/.xmonad
 fi
 
 if installed X; then
     # Prevent code duplication. Term* rules are for all terminals; XTerm rules
-    # are for XTerm and UXTerm. At the moment XTerm and UXTerm are supported.
+    # are for XTerm and UXTerm. At the moment XTerm, UXTerm and Rxvt are
+    # supported.
     generate perl Xdefaults -ne \
         'if (/^Term/) {
              s/^Term//;
@@ -33,9 +49,26 @@ if installed X; then
     sed 's/^#/!/' Xdefaults > Xdefaults.tmp
     mv Xdefaults.tmp Xdefaults
 
-    if [ `os` != darwin ]; then
+    if [ x`os` != xdarwin ]; then
         link xinitrc ~/.xinitrc
     fi
+    if [ -f xinitrc.local ]; then
+        link xinitrc.local ~/.xinitrc.local
+    fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
+    link XCompose ~/.XCompose
+fi
+
+if installed xpdf; then
+    link xpdfrc ~/.xpdfrc
+fi
+if installed zathura; then
+    mkdir -p ~/.config/zathura
+    link zathurarc ~/.config/zathura/zathurarc
+fi
+
+if installed feh; then
+    mkdir -p ~/.config
+    link feh ~/.config/feh
 fi