aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2016-09-17 19:59:09 +0200
committerDuncaen <mail@duncano.de>2016-09-17 19:59:09 +0200
commitb0367f6f740e3080c506c36f29b8ce521736bac0 (patch)
treec054c91f3c091a7d3eae9a7109927026996d0c55
parente881d67d456eedeb7784ff773f326b09d9bd9709 (diff)
downloaddotfiles-b0367f6f740e3080c506c36f29b8ce521736bac0.tar.gz
xorg: us-intl-german layout and modmap from chris2
-rwxr-xr-xinstall.sh1
-rw-r--r--us-intl-german.xmodmap71
-rw-r--r--xinitrc49
3 files changed, 93 insertions, 28 deletions
diff --git a/install.sh b/install.sh
index cb45842..f86afbb 100755
--- a/install.sh
+++ b/install.sh
@@ -20,6 +20,7 @@ _xorg() {
msg "INSTALL" "xorg config"
_ln_home "xinitrc" ".xinitrc"
_ln_home "Xresources" ".Xresources"
+ _ln_home "us-intl-german.xmodmap" ".us-intl-german.xmodmap"
}
_mksh() {
msg "INSTALL" "mksh config"
diff --git a/us-intl-german.xmodmap b/us-intl-german.xmodmap
new file mode 100644
index 0000000..774526c
--- /dev/null
+++ b/us-intl-german.xmodmap
@@ -0,0 +1,71 @@
+! us-intl-german.xmodmap - refinements for German users of us(altgr-intl)
+! 27feb2010 +chris+
+! 29mar2010 +chris+
+! 16sep2011 +chris+
+! 17nov2012 +chris+
+! 05feb2013 +chris+
+! 06dec2014 +chris+
+
+! Define the modifier key group_shift.
+! Only keys with this modifier will be changed by this file.
+! 66 is Caps Lock.
+keycode 66 = ISO_Group_Shift ISO_Group_Shift ISO_First_Group NoSymbol
+
+! Some notes to users of us(intl) or us(altgr-intl):
+!
+! With group_shift held these already do what they say if you press
+! them *as usual on the German* keyboard:
+! ^ ä ö ü ß { [ ] } ! " § $ % & / ( ) = ? ` @ µ €
+!
+! What this layout does is define these shortcuts, so you only need
+! group_switch:
+! q@ e€ aä AÄ oö OÖ uü uÜ sß mµ 5€ 8( 9)
+!
+! Additionally, we bind caps-hjkl to vi-style cursor keys, and HJKL to
+! Home, Next, Up, End.
+!
+! Additionally, these typographic features:
+! . is ellipsis, shift-. is midpoint, alt-. is irony.
+! - is en-dash, shift-- is em-dash.
+! ! is interrobang.
+! space is visible space, shift-space is nonbreaking space.
+! alt-s is long s, alt-y is ezh.
+!
+! Typographical quotes are already on altgr-caps-v/b/n „/“/”
+! (shift for single versions).
+
+! keycode NN = normal shift caps shift-caps altgr shift-altgr
+
+! umlauts on caps-aou, sharp s on caps-s.
+keycode 38 = a A adiaeresis Adiaeresis aacute Aacute ae AE
+keycode 39 = s S ssharp U017F ssharp section U017F U1E9E
+keycode 32 = o O odiaeresis Odiaeresis oacute Oacute oslash Oslash
+keycode 30 = u U udiaeresis Udiaeresis uacute Uacute downarrow uparrow
+
+! at on caps-q, euro on caps-e, mu on caps-m
+keycode 24 = q Q at Q adiaeresis Adiaeresis at Greek_OMEGA
+keycode 26 = e E EuroSign EuroSign eacute Eacute EuroSign EuroSign
+keycode 58 = m M mu M mu mu mu masculine
+
+! cursor keys on caps-hjkl
+keycode 43 = h H Left Home hstroke Hstroke
+keycode 44 = j J Down Next idiaeresis Idiaeresis dead_belowdot dead_abovedot
+keycode 45 = k K Up Prior oe OE kra ampersand
+keycode 46 = l L Right End oslash Oslash lstroke Lstroke
+
+! 5 is €, 8 is (, 9 is )
+keycode 14 = 5 percent EuroSign percent EuroSign dead_cedilla onehalf threeeighths
+keycode 17 = 8 asterisk parenleft parenleft dead_ogonek threequarters bracketleft trademark
+keycode 18 = 9 parenleft parenright parenright leftsinglequotemark dead_breve bracketright plusminus
+
+! Typographic features:
+! . is ellipsis, shift-. is midpoint, alt-. is irony.
+! - is en-dash, shift-- is em-dash.
+! ! is interrobang.
+! space is visible space, shift-space is nonbreaking space.
+! alt-s is long s, alt-y is ezh.
+keycode 60 = period greater ellipsis periodcentered dead_abovedot dead_caron U2026 division
+keycode 61 = slash question endash emdash questiondown dead_hook U061F abovedot
+keycode 10 = 1 exclam 1 U203D onesuperior exclamdown onesuperior exclamdown
+keycode 65 = space NoSymbol U2423 U00A0 space
+keycode 29 = y Y z Z udiaeresis Udiaeresis U0292 yen
diff --git a/xinitrc b/xinitrc
index 515bcdd..25bde32 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1,36 +1,29 @@
#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-# set the random wallpaper as early as possible
-feh --recursive --randomize --bg-fill --no-fehbg ~/.wallpaper
+[ -d /etc/X11/xinit/xinitrc.d ]; && \
+ for f in /etc/X11/xinit/xinitrc.d/*; do; [ -x "$f" ] && . "$f"; done && \
+ unset f
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
+[ -r ~/.wallpaper/default ] && \
+ feh --bg-fill --no-fehbg ~/.wallpaper/default || \
+ feh --recursive --randomize --bg-fill --no-fehbg ~/.wallpaper
-# Load local .Xresources
-xrdb -merge $HOME/.Xresources
+setxkbmap \
+ -layout 'us(altgr-intl),de(nodeadkeys)' \
+ -option 'grp:alt_shift_toggle,compose:menu'
+xmodmap ~/.us-intl-german.xmodmap
-# start pulseaudio -.-
-# start-pulseaudio-x11 &
+xrdb -merge ~/.Xresources
+xset b off
-xset -b
-xrandr --dpi 96 &
-setxkbmap de &
-sct 4400
+# display colors
+[ $(command -v sct 2>/dev/null) ] && sct 4400
-if [ "$(hostname)" = "fly" ]; then
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
- xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.95
-fi
+[ "$(hostname)" = "fly" ] && xinput \
+ --set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 1 \
+ --set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 2 \
+ --set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 200 \
+ --set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5 \
+ --set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.95
-exec $STARTUP runsvdir -P $HOME/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+exec $STARTUP runsvdir -P ~/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'