diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-20 19:37:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-20 19:37:22 -0400 |
| commit | 92cc88c0668655155e9b63d8f43f51b12410fdff (patch) | |
| tree | 8f4d21ec67e5045585bc7acb6baf7b12494a7f89 /.config/X11 | |
| parent | 278000a3b8a64fd000ddd8198f76bd2bf78e4557 (diff) | |
| parent | a9fb80359a3e84ed7b64d3ecdf699acc5e53abc9 (diff) | |
Merge branch 'master' into build64-par/master
Diffstat (limited to '.config/X11')
| -rw-r--r--[-rwxr-xr-x] | .config/X11/clientrc | 2 | ||||
| -rwxr-xr-x | .config/X11/login | 9 | ||||
| -rw-r--r-- | .config/X11/modmap | 2 | ||||
| -rw-r--r-- | .config/X11/serverrc | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index 2c965da..88ae527 100755..100644 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/hint/sh # Load system xinit modules (disabled) # Remove "false &&" to enable diff --git a/.config/X11/login b/.config/X11/login index 84931df..d02088a 100755 --- a/.config/X11/login +++ b/.config/X11/login @@ -1,9 +1,4 @@ #!/bin/sh +# ~/.xsession: Executed by the XDM at login, maybe after sourcing ~/.xprofile -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -exec bash --login -i ~/.xinitrc +exec bash --login ~/.xinitrc diff --git a/.config/X11/modmap b/.config/X11/modmap index 1736e09..b332204 100644 --- a/.config/X11/modmap +++ b/.config/X11/modmap @@ -1,3 +1,5 @@ +! -*- Mode: Xmodmap -*- + ! My desktop doesn't have a super key, so I map Caps_Lock to Super_L ! Also, use Caps_Lock for the compose key remove lock = Caps_Lock diff --git a/.config/X11/serverrc b/.config/X11/serverrc index 6b57eeb..e6f4c8f 100644 --- a/.config/X11/serverrc +++ b/.config/X11/serverrc @@ -1,4 +1,4 @@ -#!/bin/sh +#!/hint/sh if [ -z "$XDG_VTNR" ]; then exec /usr/bin/X -nolisten tcp "$@" else |