Kevin Heinicke 8 лет назад
Родитель
Сommit
d1dd234b9d
3 измененных файлов с 51 добавлено и 3 удалено
  1. 2 3
      install
  2. 2 0
      install_arch.conf.yaml
  3. 47 0
      xinitrc

+ 2 - 3
install

@@ -3,7 +3,6 @@
 set -e
 
 CONFIG="install.conf.yaml"
-CONFIG_OSX="install_osx.conf.yaml"
 DOTBOT_DIR="dotbot"
 
 DOTBOT_BIN="bin/dotbot"
@@ -14,6 +13,6 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
 
 "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}"
 
-if [[ "${@}" == "osx" ]]; then
-     "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG_OSX}"
+if [[ -n "${@}" ]]; then
+     "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "install_${@}.conf.yaml"
 fi

+ 2 - 0
install_arch.conf.yaml

@@ -0,0 +1,2 @@
+- link:
+    ~/.xinitrc: xinitrc

+ 47 - 0
xinitrc

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+twm &
+xclock -geometry 50x50-1+1 &
+xterm -geometry 80x50+494+51 &
+xterm -geometry 80x20+494-0 &
+exec xterm -geometry 80x66+0+0 -name login
+# exec gnome-session
+
+# user-defined stuff
+setxkbmap -option caps:swapescape