From c13b6347ac065da59e8645479a37005fd3fb412d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 10 Oct 2012 01:33:02 -0400 Subject: ditch ConsoleKit in .xinitrc --- .xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.xinitrc') diff --git a/.xinitrc b/.xinitrc index 9c5ce55..bfc352b 100644 --- a/.xinitrc +++ b/.xinitrc @@ -23,4 +23,4 @@ fi # exec startkde # exec startxfce4 # ...or the Window Manager of your choice -exec ck-launch-session wmii +exec wmii -- cgit v1.2.3-54-g00ecf From 281adcda20ee3b0d65a416dfb0d6a0d1413dc1be Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Oct 2012 20:13:58 -0400 Subject: move the X11 config files to .config/X11, add a serverrc file remove extra newline from .config/X11/login --- .Xdefaults | 19 +------------------ .config/X11/clientrc | 27 +++++++++++++++++++++++++++ .config/X11/defaults | 18 ++++++++++++++++++ .config/X11/login | 9 +++++++++ .config/X11/modmap | 7 +++++++ .config/X11/serverrc | 6 ++++++ .xinitrc | 27 +-------------------------- .xserverrc | 1 + .xsession | 11 +---------- 9 files changed, 71 insertions(+), 54 deletions(-) mode change 100644 => 120000 .Xdefaults create mode 100644 .config/X11/clientrc create mode 100644 .config/X11/defaults create mode 100644 .config/X11/login create mode 100644 .config/X11/modmap create mode 100644 .config/X11/serverrc mode change 100644 => 120000 .xinitrc create mode 120000 .xserverrc mode change 100644 => 120000 .xsession (limited to '.xinitrc') diff --git a/.Xdefaults b/.Xdefaults deleted file mode 100644 index ceabc5c..0000000 --- a/.Xdefaults +++ /dev/null @@ -1,18 +0,0 @@ -URxvt.background: #000000 -URxvt.foreground: #CCCCCC - -URxvt.scrollstyle: plain -URxvt.scrollBar_floating: true - -URxvt.font: xft:Monospace-8 -URxvt.cursorBlink: true -URxvt.termName: xterm-256color -URxvt.pastableTabs: true - -URxvt.scrollTtyOutput: false -URxvt.scrollTtyKeypress: false -URxvt.scrollWithBuffer: true - -URxvt.perl-ext-common: default,matcher -URxvt.urlLauncher: v-www-browser -URxvt.matcher.button: 1 diff --git a/.Xdefaults b/.Xdefaults new file mode 120000 index 0000000..7588317 --- /dev/null +++ b/.Xdefaults @@ -0,0 +1 @@ +.config/X11/defaults \ No newline at end of file diff --git a/.config/X11/clientrc b/.config/X11/clientrc new file mode 100644 index 0000000..d1e1725 --- /dev/null +++ b/.config/X11/clientrc @@ -0,0 +1,27 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +if [ -d /etc/X11/xinit/xinitrc.d ]; then + echo ' ==> Running scripts in Entering xinitrc.d/*' + for f in /etc/X11/xinit/xinitrc.d/*; do + echo " -> $f" + [ -x "$f" ] && "$f" & + done + unset f + echo ' -> done' +fi + +usermodmap="$XDG_CONFIG_HOME/X11/modmap" +if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" +fi + +# exec gnome-session +# exec startkde +# exec startxfce4 +# ...or the Window Manager of your choice +#export WMII_CONFPATH="$XDG_CONFIG_HOME/wmii" +exec wmii diff --git a/.config/X11/defaults b/.config/X11/defaults new file mode 100644 index 0000000..ceabc5c --- /dev/null +++ b/.config/X11/defaults @@ -0,0 +1,18 @@ +URxvt.background: #000000 +URxvt.foreground: #CCCCCC + +URxvt.scrollstyle: plain +URxvt.scrollBar_floating: true + +URxvt.font: xft:Monospace-8 +URxvt.cursorBlink: true +URxvt.termName: xterm-256color +URxvt.pastableTabs: true + +URxvt.scrollTtyOutput: false +URxvt.scrollTtyKeypress: false +URxvt.scrollWithBuffer: true + +URxvt.perl-ext-common: default,matcher +URxvt.urlLauncher: v-www-browser +URxvt.matcher.button: 1 diff --git a/.config/X11/login b/.config/X11/login new file mode 100644 index 0000000..03bad2a --- /dev/null +++ b/.config/X11/login @@ -0,0 +1,9 @@ +#!/bin/sh + +# +# ~/.xsession +# +# Executed by xdm/gdm/kdm at login +# + +/bin/bash --login -i ~/.xinitrc diff --git a/.config/X11/modmap b/.config/X11/modmap new file mode 100644 index 0000000..e4ade24 --- /dev/null +++ b/.config/X11/modmap @@ -0,0 +1,7 @@ +remove lock = Caps_Lock +keysym Caps_Lock = Super_L + +keycode 135 = Super_R + +clear mod4 +add mod4 = Super_L Super_R Hyper_L Hyper_R Menu diff --git a/.config/X11/serverrc b/.config/X11/serverrc new file mode 100644 index 0000000..d6c6ffc --- /dev/null +++ b/.config/X11/serverrc @@ -0,0 +1,6 @@ +#!/bin/bash + +VT=vt07 +#VT=$(tty|sed 's@/dev/tty@vt@') + +exec /usr/bin/X -nolisten tcp "$VT" "$@" diff --git a/.xinitrc b/.xinitrc deleted file mode 100644 index bfc352b..0000000 --- a/.xinitrc +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - echo ' ==> Running scripts in Entering xinitrc.d/*' - for f in /etc/X11/xinit/xinitrc.d/*; do - echo " -> $f" - [ -x "$f" ] && "$f" & - done - unset f - echo ' -> done' -fi - -usermodmap="$HOME/.xmodmap" -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice -exec wmii diff --git a/.xinitrc b/.xinitrc new file mode 120000 index 0000000..c0f7e1c --- /dev/null +++ b/.xinitrc @@ -0,0 +1 @@ +.config/X11/clientrc \ No newline at end of file diff --git a/.xserverrc b/.xserverrc new file mode 120000 index 0000000..f46e3e3 --- /dev/null +++ b/.xserverrc @@ -0,0 +1 @@ +.config/X11/serverrc \ No newline at end of file diff --git a/.xsession b/.xsession deleted file mode 100644 index a16dc0b..0000000 --- a/.xsession +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - diff --git a/.xsession b/.xsession new file mode 120000 index 0000000..ee16887 --- /dev/null +++ b/.xsession @@ -0,0 +1 @@ +.config/X11/login \ No newline at end of file -- cgit v1.2.3-54-g00ecf