From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 8 Aug 2015 00:35:57 +0000 (+0200)
Subject: Separate dotfiles into those used on thinkpad and those used always.
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/condition?a=commitdiff_plain;h=e92f47f3957789c6b66c75c8ffd5b6520139a462;p=config

Separate dotfiles into those used on thinkpad and those used always.
---

diff --git a/dotfiles/bash_profile b/dotfiles/bash_profile
deleted file mode 100644
index 17d538c..0000000
--- a/dotfiles/bash_profile
+++ /dev/null
@@ -1,3 +0,0 @@
-# initialization for login shells
-
-source ~/.bashrc
diff --git a/dotfiles/bashrc b/dotfiles/bashrc
deleted file mode 100644
index 2f21e27..0000000
--- a/dotfiles/bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# plomlompom's bashrc for non-login shells
-
-# Fancy colors for ls.
-alias ls="ls --color=auto"
-
-# Blue prompt with time.
-PS1="\[\e[1;34m\][\\t \\u@\\h \\w]$\[\e[m\] "
-PS2="\[\e[1;34m\]>\[\e[m\] "
-PS3="\[\e[1;34m\]>\[\e[m\] "
-PS4="\[\e[1;34m\]+\[\e[m\] "
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
deleted file mode 100644
index 5cdc162..0000000
--- a/dotfiles/gitconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-	name = Christian Heller
-	email = c.heller@plomlompom.de
diff --git a/dotfiles/i3/config b/dotfiles/i3/config
deleted file mode 100644
index 6330887..0000000
--- a/dotfiles/i3/config
+++ /dev/null
@@ -1,83 +0,0 @@
-# plomlompom's i3-wm configuration
-
-# Font for i3 text
-font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-
-# Force "tabbed" as default layout for new windows.
-workspace_layout              tabbed
-
-# Make the Windows key the modifier key for all i3-wm actions.
-set                           $mod Mod4
-floating_modifier             $mod
-
-# Launch xterm small-font white-on-black or big-font black-on-white. 
-bindsym $mod+Return           exec xterm -ls -r
-bindsym $mod+Shift+Return     exec xterm -ls -fn 10x20
-
-# Launch programs via dmenu.
-bindsym $mod+d                exec dmenu_run
-
-# Kill window.
-bindsym $mod+Shift+Q          kill
-
-# Move focus between windows.
-bindsym $mod+Left             focus left
-bindsym $mod+Down             focus down
-bindsym $mod+Up               focus up
-bindsym $mod+Right            focus right
-
-# Don't move focus with mouse.
-focus_follows_mouse           no
-
-# Move windows.
-bindsym $mod+Shift+Left       move left
-bindsym $mod+Shift+Down       move down
-bindsym $mod+Shift+Up         move up
-bindsym $mod+Shift+Right      move right
-
-# Resize windows
-bindsym $mod+h                resize shrink width
-bindsym $mod+l                resize grow width
-bindsym $mod+j                resize shrink height
-bindsym $mod+k                resize grow height
-
-# Toggle fullscreen for focused window.
-bindsym $mod+f                fullscreen
-
-# Toggle floating of window, focus on floating or tabbed windows.
-bindsym $mod+Shift+space      floating toggle
-bindsym $mod+space            focus mode_toggle
-
-# Switch to workspace x.
-bindsym $mod+1                workspace 1
-bindsym $mod+2                workspace 2
-bindsym $mod+3                workspace 3
-bindsym $mod+4                workspace 4
-bindsym $mod+5                workspace 5
-bindsym $mod+6                workspace 6
-bindsym $mod+7                workspace 7
-bindsym $mod+8                workspace 8
-bindsym $mod+9                workspace 9
-bindsym $mod+0                workspace 10
-
-# Move window to workspace x.
-bindsym $mod+Shift+exclam     move workspace 1
-bindsym $mod+Shift+quotedbl   move workspace 2
-bindsym $mod+Shift+section    move workspace 3
-bindsym $mod+Shift+dollar     move workspace 4
-bindsym $mod+Shift+percent    move workspace 5
-bindsym $mod+Shift+ampersand  move workspace 6
-bindsym $mod+Shift+slash      move workspace 7
-bindsym $mod+Shift+parenleft  move workspace 8
-bindsym $mod+Shift+parenright move workspace 9
-bindsym $mod+Shift+equal      move workspace 10
-
-# Reload i3 config file, restart (keeping sesion) i3, exit i3.
-bindsym $mod+Shift+C          reload
-bindsym $mod+Shift+R          restart
-bindsym $mod+Shift+P          exit
-
-# Select "i3status" as i3 status bar.
-bar {
-        status_command            i3status
-}
diff --git a/dotfiles/i3status.conf b/dotfiles/i3status.conf
deleted file mode 100644
index 9565c9f..0000000
--- a/dotfiles/i3status.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# plomlompom's i3 status bar configuration
-
-# Activate colors; set update interval of one second.
-general {
-        colors = true
-        interval = 1
-}
-
-# Selection / order of status elements.
-order += "disk /"
-order += "disk /home"
-order += "wireless wlan0"
-order += "ethernet eth0"
-order += "battery 0"
-order += "cpu_temperature 0"
-order += "load"
-order += "time"
-
-# How much space is left in / ?
-disk "/" {
-    format = "%free"
-}
-
-# How much space is left in /home ?
-disk "/home" {
-    format = "%free"
-}
-
-
-# WLAN status: show IP and connection quality or "down".
-wireless wlan0 {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
-}
-
-# Ethernet status: show IP or "down".
-ethernet eth0 {
-        format_up = "E: %ip"
-        format_down = "E: down"
-}
-
-# Battery status: show FULL/CHARGING/BATTERY, storage, time left.
-battery 0 {
-        format = "%status %percentage %remaining"
-}
-
-# Show CPU temperature in degrees of celsius.
-cpu_temperature 0 {
-        format = "T: %degrees °C"
-}
-
-# Show system load during last 1/5/15 minutes.
-load {
-    format = "L: %1min %5min %15min"
-}
-
-# Show date/time/timezone as "year-month-day hour:minute:second
-# timezone_numeric/timezone_alphabetic".
-time {
-
-    format = "%Y-%m-%d %H:%M:%S %z/%Z"
-}
diff --git a/dotfiles/pentadactylrc b/dotfiles/pentadactylrc
deleted file mode 100644
index 01e1e67..0000000
--- a/dotfiles/pentadactylrc
+++ /dev/null
@@ -1,14 +0,0 @@
-set! browser.startup.page=3
-set! privacy.donottrackheader.enabled=true
-set! network.cookie.lifetimePolicy=2
-set! browser.formfill.enable=false
-set! browser.block.target_new_window=true
-set! browser.download.lastDir=~/downloads
-set! javascript.enabled=false
-"set! permissions.default.image=2
-set! general.useragent.override=foo
-set! signon.rememberSignons=false
-set go=CMsbr
-set showtabline=never
-highlight Hint -append font: "Droid Sans Mono"; margin: 0em; padding: 0.1em; padding-right: 0.2em; 
-command plom open http://www.plomlompom.de/PlomWiki/plomwiki.php?title=Start
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
deleted file mode 100644
index 107aef9..0000000
--- a/dotfiles/vimrc
+++ /dev/null
@@ -1,18 +0,0 @@
-" Activate syntax highlighting.
-syntax on
-filetype plugin on
-
-" Don't add unsolicited final newline.
-set binary
-
-" Indentation rules (tabs to 4 spaces).
-set expandtab
-set shiftwidth=4
-set softtabstop=4
-
-" Backups.
-set backup
-set backupdir=~/.vimbackups
-let myvar = strftime("%Y-%m-%d_%H-%M-%S")
-let myvar = "set backupext=_". myvar
-execute myvar
diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
deleted file mode 100644
index 250994f..0000000
--- a/dotfiles/xinitrc
+++ /dev/null
@@ -1,7 +0,0 @@
-# X init configuration
-
-# Set keymap.
-setxkbmap de
-
-# Launch window manager.
-i3
diff --git a/dotfiles_user_minimal/bash_profile b/dotfiles_user_minimal/bash_profile
new file mode 100644
index 0000000..17d538c
--- /dev/null
+++ b/dotfiles_user_minimal/bash_profile
@@ -0,0 +1,3 @@
+# initialization for login shells
+
+source ~/.bashrc
diff --git a/dotfiles_user_minimal/bashrc b/dotfiles_user_minimal/bashrc
new file mode 100644
index 0000000..2f21e27
--- /dev/null
+++ b/dotfiles_user_minimal/bashrc
@@ -0,0 +1,10 @@
+# plomlompom's bashrc for non-login shells
+
+# Fancy colors for ls.
+alias ls="ls --color=auto"
+
+# Blue prompt with time.
+PS1="\[\e[1;34m\][\\t \\u@\\h \\w]$\[\e[m\] "
+PS2="\[\e[1;34m\]>\[\e[m\] "
+PS3="\[\e[1;34m\]>\[\e[m\] "
+PS4="\[\e[1;34m\]+\[\e[m\] "
diff --git a/dotfiles_user_minimal/gitconfig b/dotfiles_user_minimal/gitconfig
new file mode 100644
index 0000000..5cdc162
--- /dev/null
+++ b/dotfiles_user_minimal/gitconfig
@@ -0,0 +1,3 @@
+[user]
+	name = Christian Heller
+	email = c.heller@plomlompom.de
diff --git a/dotfiles_user_minimal/vimrc b/dotfiles_user_minimal/vimrc
new file mode 100644
index 0000000..107aef9
--- /dev/null
+++ b/dotfiles_user_minimal/vimrc
@@ -0,0 +1,18 @@
+" Activate syntax highlighting.
+syntax on
+filetype plugin on
+
+" Don't add unsolicited final newline.
+set binary
+
+" Indentation rules (tabs to 4 spaces).
+set expandtab
+set shiftwidth=4
+set softtabstop=4
+
+" Backups.
+set backup
+set backupdir=~/.vimbackups
+let myvar = strftime("%Y-%m-%d_%H-%M-%S")
+let myvar = "set backupext=_". myvar
+execute myvar
diff --git a/dotfiles_user_thinkpad/i3/config b/dotfiles_user_thinkpad/i3/config
new file mode 100644
index 0000000..6330887
--- /dev/null
+++ b/dotfiles_user_thinkpad/i3/config
@@ -0,0 +1,83 @@
+# plomlompom's i3-wm configuration
+
+# Font for i3 text
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+
+# Force "tabbed" as default layout for new windows.
+workspace_layout              tabbed
+
+# Make the Windows key the modifier key for all i3-wm actions.
+set                           $mod Mod4
+floating_modifier             $mod
+
+# Launch xterm small-font white-on-black or big-font black-on-white. 
+bindsym $mod+Return           exec xterm -ls -r
+bindsym $mod+Shift+Return     exec xterm -ls -fn 10x20
+
+# Launch programs via dmenu.
+bindsym $mod+d                exec dmenu_run
+
+# Kill window.
+bindsym $mod+Shift+Q          kill
+
+# Move focus between windows.
+bindsym $mod+Left             focus left
+bindsym $mod+Down             focus down
+bindsym $mod+Up               focus up
+bindsym $mod+Right            focus right
+
+# Don't move focus with mouse.
+focus_follows_mouse           no
+
+# Move windows.
+bindsym $mod+Shift+Left       move left
+bindsym $mod+Shift+Down       move down
+bindsym $mod+Shift+Up         move up
+bindsym $mod+Shift+Right      move right
+
+# Resize windows
+bindsym $mod+h                resize shrink width
+bindsym $mod+l                resize grow width
+bindsym $mod+j                resize shrink height
+bindsym $mod+k                resize grow height
+
+# Toggle fullscreen for focused window.
+bindsym $mod+f                fullscreen
+
+# Toggle floating of window, focus on floating or tabbed windows.
+bindsym $mod+Shift+space      floating toggle
+bindsym $mod+space            focus mode_toggle
+
+# Switch to workspace x.
+bindsym $mod+1                workspace 1
+bindsym $mod+2                workspace 2
+bindsym $mod+3                workspace 3
+bindsym $mod+4                workspace 4
+bindsym $mod+5                workspace 5
+bindsym $mod+6                workspace 6
+bindsym $mod+7                workspace 7
+bindsym $mod+8                workspace 8
+bindsym $mod+9                workspace 9
+bindsym $mod+0                workspace 10
+
+# Move window to workspace x.
+bindsym $mod+Shift+exclam     move workspace 1
+bindsym $mod+Shift+quotedbl   move workspace 2
+bindsym $mod+Shift+section    move workspace 3
+bindsym $mod+Shift+dollar     move workspace 4
+bindsym $mod+Shift+percent    move workspace 5
+bindsym $mod+Shift+ampersand  move workspace 6
+bindsym $mod+Shift+slash      move workspace 7
+bindsym $mod+Shift+parenleft  move workspace 8
+bindsym $mod+Shift+parenright move workspace 9
+bindsym $mod+Shift+equal      move workspace 10
+
+# Reload i3 config file, restart (keeping sesion) i3, exit i3.
+bindsym $mod+Shift+C          reload
+bindsym $mod+Shift+R          restart
+bindsym $mod+Shift+P          exit
+
+# Select "i3status" as i3 status bar.
+bar {
+        status_command            i3status
+}
diff --git a/dotfiles_user_thinkpad/i3status.conf b/dotfiles_user_thinkpad/i3status.conf
new file mode 100644
index 0000000..9565c9f
--- /dev/null
+++ b/dotfiles_user_thinkpad/i3status.conf
@@ -0,0 +1,62 @@
+# plomlompom's i3 status bar configuration
+
+# Activate colors; set update interval of one second.
+general {
+        colors = true
+        interval = 1
+}
+
+# Selection / order of status elements.
+order += "disk /"
+order += "disk /home"
+order += "wireless wlan0"
+order += "ethernet eth0"
+order += "battery 0"
+order += "cpu_temperature 0"
+order += "load"
+order += "time"
+
+# How much space is left in / ?
+disk "/" {
+    format = "%free"
+}
+
+# How much space is left in /home ?
+disk "/home" {
+    format = "%free"
+}
+
+
+# WLAN status: show IP and connection quality or "down".
+wireless wlan0 {
+        format_up = "W: (%quality at %essid) %ip"
+        format_down = "W: down"
+}
+
+# Ethernet status: show IP or "down".
+ethernet eth0 {
+        format_up = "E: %ip"
+        format_down = "E: down"
+}
+
+# Battery status: show FULL/CHARGING/BATTERY, storage, time left.
+battery 0 {
+        format = "%status %percentage %remaining"
+}
+
+# Show CPU temperature in degrees of celsius.
+cpu_temperature 0 {
+        format = "T: %degrees °C"
+}
+
+# Show system load during last 1/5/15 minutes.
+load {
+    format = "L: %1min %5min %15min"
+}
+
+# Show date/time/timezone as "year-month-day hour:minute:second
+# timezone_numeric/timezone_alphabetic".
+time {
+
+    format = "%Y-%m-%d %H:%M:%S %z/%Z"
+}
diff --git a/dotfiles_user_thinkpad/pentadactylrc b/dotfiles_user_thinkpad/pentadactylrc
new file mode 100644
index 0000000..01e1e67
--- /dev/null
+++ b/dotfiles_user_thinkpad/pentadactylrc
@@ -0,0 +1,14 @@
+set! browser.startup.page=3
+set! privacy.donottrackheader.enabled=true
+set! network.cookie.lifetimePolicy=2
+set! browser.formfill.enable=false
+set! browser.block.target_new_window=true
+set! browser.download.lastDir=~/downloads
+set! javascript.enabled=false
+"set! permissions.default.image=2
+set! general.useragent.override=foo
+set! signon.rememberSignons=false
+set go=CMsbr
+set showtabline=never
+highlight Hint -append font: "Droid Sans Mono"; margin: 0em; padding: 0.1em; padding-right: 0.2em; 
+command plom open http://www.plomlompom.de/PlomWiki/plomwiki.php?title=Start
diff --git a/dotfiles_user_thinkpad/xinitrc b/dotfiles_user_thinkpad/xinitrc
new file mode 100644
index 0000000..250994f
--- /dev/null
+++ b/dotfiles_user_thinkpad/xinitrc
@@ -0,0 +1,7 @@
+# X init configuration
+
+# Set keymap.
+setxkbmap de
+
+# Launch window manager.
+i3
diff --git a/jessie_start.sh b/jessie_start.sh
index 781ef43..9a92ce7 100755
--- a/jessie_start.sh
+++ b/jessie_start.sh
@@ -71,7 +71,7 @@ config/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/symlink.sh
+su plom -c '/home/plom/config/symlink.sh thinkpad'
 
 # Set up editor.
 apt-get -y install vim
diff --git a/symlink.sh b/symlink.sh
index 1b966ef..8a5488e 100755
--- a/symlink.sh
+++ b/symlink.sh
@@ -2,13 +2,19 @@
 
 set -x
 
-dir=~/config/dotfiles
+dir_user_minimal=~/config/dotfiles_user_minimal
+dir_user_thinkpad=~/config/dotfiles_user_thinkpad
 dir_root=~/config/dotfiles_root
 homedir=`echo ~`
 find ~ -lname $homedir'/config/*' -delete
-for file in `ls $dir`; do
-    ln -s $dir/$file ~/.$file
+for file in `ls $dir_user_minimal`; do
+    ln -s $dir_user_minimal/$file ~/.$file
 done
+if [ "$1" = "thinkpad" ]; then
+    for file in `ls $dir_user_thinkpad`; do
+        ln -s $dir_user_thinkpad/$file ~/.$file
+    done
+fi
 if [ "$(id -u)" -eq "0" ]; then
     for file in `ls $dir_root`; do
         ln -fs $dir_root/$file ~/.$file