aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2016-03-11 12:49:29 +0100
committerDavid Runge <dave@sleepmap.de>2016-03-11 12:49:29 +0100
commit636ab8dfcfc41225f88d7cd1a35d2cd9a42ab73a (patch)
tree07def9f13721d8fd78d6203a7c16a5f3cd192aa7
parentdaa16bf3603206c64cc8f6d734ba4bdea095ff7f (diff)
parent1339b8e7b05d70e2e5aefb5d4898d46039870767 (diff)
downloaddotfiles-636ab8dfcfc41225f88d7cd1a35d2cd9a42ab73a.tar.gz
dotfiles-636ab8dfcfc41225f88d7cd1a35d2cd9a42ab73a.tar.bz2
dotfiles-636ab8dfcfc41225f88d7cd1a35d2cd9a42ab73a.tar.xz
dotfiles-636ab8dfcfc41225f88d7cd1a35d2cd9a42ab73a.zip
Merge branch 'master' of sleepmap.de:dotfiles
* 'master' of sleepmap.de:dotfiles: .xprofile: Adding setxkbmap, xmodmap, xrdb settings to xprofile. Starting lxpolkit as polkit auth handler, if it is installed.
-rw-r--r--.xprofile18
1 files changed, 17 insertions, 1 deletions
diff --git a/.xprofile b/.xprofile
index dc372e2..2c5e0e7 100644
--- a/.xprofile
+++ b/.xprofile
@@ -1,6 +1,22 @@
#!/usr/bin/env bash
-setxkbmap de &
+#X11 keyboard maps
+setxkbmap -layout de &
+
+# use .Xmodmap
+if [[ -f ~/.Xmodmap ]]; then
+ /usr/bin/xmodmap ~/.Xmodmap &
+fi
+
+# use .Xresources
+if [[ -f ~/.Xresources ]];then
+ /usr/bin/xrdb ~/.Xresources &
+fi
+
+# start lxpolkit to have polkit authentication
+if [ -x /usr/bin/lxpolkit ]; then
+ /usr/bin/lxpolkit &
+fi
if [ -x "$HOME/bin/lid-switch-action" ] && [ "$HOSTNAME" = dvzrv ]; then
$HOME/bin/lid-switch-action login &