Read in Xresources to define terminal colors.

diff --git a/bin/symlink.sh b/bin/symlink.sh
index 412b55d9e3001c7d8b425902eaa26b66ed9a47a8..74cdb7bf2b74d90a6bc78d82cded8dcefc8f320e 100755 (executable)
--- a/bin/symlink.sh
+++ b/bin/symlink.sh
@@ -5,6 +5,8 @@ set -x
 dir_minimal=~/config/dotfiles/minimal
 dir_user_minimal=~/config/dotfiles/user/minimal
 dir_user_thinkpad=~/config/dotfiles/user/thinkpad
+dir_user_X200s=~/config/dotfiles/user/x200s
+dir_user_T450s=~/config/dotfiles/user/t450s
 dir_user_server=~/config/dotfiles/user/server
 dir_root=~/config/dotfiles/root
 homedir=`echo ~`
@@ -24,6 +26,15 @@ else
         for file in `ls $dir_user_thinkpad`; do
             ln -fs $dir_user_thinkpad/$file ~/.$file
         done
+        if [ "$2" = "x200s" ]; then
+            for file in `ls $dir_user_X200s`; do
+                ln -fs $dir_user_X200s/$file ~/.$file
+            done
+        else
+            for file in `ls $dir_user_T450s`; do
+                ln -fs $dir_user_T450s/$file ~/.$file
+            done
+        fi
     elif [ "$1" = "server" ]; then
         for file in `ls $dir_user_server`; do
             ln -fs $dir_user_server/$file ~/.$file

diff --git a/dotfiles/user/t450s/Xresources b/dotfiles/user/t450s/Xresources
new file mode 100644 (file)
index 0000000..818d251
--- /dev/null
+++ b/dotfiles/user/t450s/Xresources
@@ -0,0 +1,31 @@
+! black
+*color0: #202020
+*color8: #3F3F3F
+
+! red
+*color1: #A82020 
+*color9: #E82020
+
+! green
+*color2: #20A820
+*color10: #20E820
+
+! yellow
+*color3: #A8A820
+*color11: #E8E820 
+
+! blue
+*color4: #3F3FFF
+*color12: #9F9FFF
+
+! magenta
+*color5: #A83FFF
+*color13: #E89FFF
+
+! cyan
+*color6: #3FA8FF
+*color14: #9FE8FF
+
+! white
+*color7: #A8A8A8
+*color15: #E8E8E8

diff --git a/dotfiles/user/thinkpad/xinitrc b/dotfiles/user/thinkpad/xinitrc
index 92311fa364ef7bbb90c6330f403439d35e1b3b8d..295381a5b19a4099f9ecd1619365ff0758bf467a 100644 (file)
--- a/dotfiles/user/thinkpad/xinitrc
+++ b/dotfiles/user/thinkpad/xinitrc
@@ -3,6 +3,9 @@
 # Set keymap.
 setxkbmap de
 
+# Read in X configuration.
+xrdb -merge ~/.Xresources
+
 # Redshift to Berlin, Germany.
 redshift -l 53:13 &
 

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 7aafe79cd2f273f8adf8e1d9979de71470eb636f..f073da1c21f3e590c3ab1435a6db04372ed4ac1e 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -136,7 +136,7 @@ config/bin/symlink.sh
 useradd -m -s /bin/bash plom
 rm -rf /home/plom/config
 su - plom -c 'git clone http://github.com/plomlompom/config /home/plom/config'
-su plom -c '/home/plom/config/bin/symlink.sh '$1
+su plom -c '/home/plom/config/bin/symlink.sh '$1 $2
 
 # Set up editor.
 mkdir -p .vimbackups