Tue, 03 Oct 2017 11:32:34 -0400
okay, i think this is acceptable tidy
512 | 1 | #!/bin/sh |
52
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
2 | |
512 | 3 | PLATFORM="$(uname -s)" |
507
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
4 | VIRT='no' |
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
5 | |
512 | 6 | if [ "$PLATFORM" = "OpenBSD" ]; then |
154
72e18304b485
Fixes for trying to set up profile on OpenBSD
Meredith Howard <mhoward@roomag.org>
parents:
69
diff
changeset
|
7 | PATH="/usr/X11R6/bin:$PATH" |
52
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
8 | fi |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
9 | |
617 | 10 | make -s -C ~/.i3 || { |
11 | cat ~/.i3/config.d/* > ~/.i3/config | |
12 | cat ~/.i3/status.d/* > ~/.i3/status | |
13 | } | |
14 | ||
15 | hsetroot -solid "#002244" || | |
385
e3c8e2bdfccf
Make sure root color gets set right
Meredith Howard <mhoward@roomag.org>
parents:
379
diff
changeset
|
16 | xsetroot -def -solid "#002244" |
e3c8e2bdfccf
Make sure root color gets set right
Meredith Howard <mhoward@roomag.org>
parents:
379
diff
changeset
|
17 | |
154
72e18304b485
Fixes for trying to set up profile on OpenBSD
Meredith Howard <mhoward@roomag.org>
parents:
69
diff
changeset
|
18 | xmodmap ~/.xmodmaprc |
609
46f19b7955d8
add check for .xmodmaprc.local
Meredith Howard <mhoward@roomag.org>
parents:
571
diff
changeset
|
19 | if [ -r ~/.xmodmaprc.local ]; then |
46f19b7955d8
add check for .xmodmaprc.local
Meredith Howard <mhoward@roomag.org>
parents:
571
diff
changeset
|
20 | xmodmap ~/.xmodmaprc.local |
46f19b7955d8
add check for .xmodmaprc.local
Meredith Howard <mhoward@roomag.org>
parents:
571
diff
changeset
|
21 | fi |
52
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
22 | |
56
e341df2dafda
Allow .Xdefaults.local to be included, don\'t rely on system to run xrdb -cpp
Meredith Howard <mhoward@roomag.org>
parents:
52
diff
changeset
|
23 | if [ -r ~/.Xdefaults.local ]; then |
154
72e18304b485
Fixes for trying to set up profile on OpenBSD
Meredith Howard <mhoward@roomag.org>
parents:
69
diff
changeset
|
24 | xrdb -quiet -merge -DUSE_LOCAL ~/.Xdefaults |
56
e341df2dafda
Allow .Xdefaults.local to be included, don\'t rely on system to run xrdb -cpp
Meredith Howard <mhoward@roomag.org>
parents:
52
diff
changeset
|
25 | fi |
e341df2dafda
Allow .Xdefaults.local to be included, don\'t rely on system to run xrdb -cpp
Meredith Howard <mhoward@roomag.org>
parents:
52
diff
changeset
|
26 | |
617 | 27 | xcompmgr -n & |
65
9c8f98eb7e1b
add xmodmap, move urxvtd until after xmodmap and defaults
Meredith Howard <mhoward@roomag.org>
parents:
57
diff
changeset
|
28 | |
617 | 29 | urxvtd -o & |
378
e13ba40f4533
Break i3 and i3status configs into component files, to make local mods easier maybe
Meredith Howard <mhoward@roomag.org>
parents:
282
diff
changeset
|
30 | |
42 | 31 | if [ -r ~/.xsessionrc.local ]; then |
282
f6890bef382e
This stuff runs under sh anyway
Meredith Howard <mhoward@roomag.org>
parents:
280
diff
changeset
|
32 | . ~/.xsessionrc.local |
42 | 33 | fi |
34 | ||
507
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
35 | if [ "$VIRT" = "yes" ]; then |
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
36 | xset b off -dpms s off |
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
37 | else |
523 | 38 | xset b off s 300 dpms 360 |
507
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
39 | xautolock -detectsleep & |
617 | 40 | pulseaudio --daemonize=no & |
41 | nm-applet & | |
507
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
42 | fi |
2ac6810a2e4a
Move stuff from lt branch in as common config if not virtual
Meredith Howard <mhoward@roomag.org>
parents:
385
diff
changeset
|
43 | |
617 | 44 | jobs >&2 |
45 |