about summary refs log tree commit diff stats
path: root/tools/conf/etc
diff options
context:
space:
mode:
Diffstat (limited to 'tools/conf/etc')
-rw-r--r--tools/conf/etc/X11/xinit/xinitrc35
-rw-r--r--tools/conf/etc/skel/.xinitrc12
2 files changed, 42 insertions, 5 deletions
diff --git a/tools/conf/etc/X11/xinit/xinitrc b/tools/conf/etc/X11/xinit/xinitrc
new file mode 100644
index 0000000..2607046
--- /dev/null
+++ b/tools/conf/etc/X11/xinit/xinitrc
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
diff --git a/tools/conf/etc/skel/.xinitrc b/tools/conf/etc/skel/.xinitrc
index c331d37..6ccd340 100644
--- a/tools/conf/etc/skel/.xinitrc
+++ b/tools/conf/etc/skel/.xinitrc
@@ -1,11 +1,13 @@
+## Start the window manager
 
-#xrandr --output eDP1 --mode 1024x768
+xrandr -s 1366x768
 #xrandr --dpi 100
+#xrandr --output eDP1 --mode 1366x768
 #xgamma -gamma 0.8
-syndaemon -d
-#
-## Start the window manager
+#syndaemon -d
+setxkbmap dvorak
 
-#exec dwm
 #exec openbox-session
+#exec dwm
 exec spectrwm
+#exec start-mate
' href='/charadon/games/Pong-C/blame/src/main.c?h=v0.3&id=66881a0a3136c871fb0c58aa31be174c60bcf118'>^
b1de600
b1de600
e372341 ^
b1de600




1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129