Sat, 28 Jun 2014 03:25:18 -0400
Merge from default
42 | 1 | #!/bin/bash |
2 | ||
52
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
3 | if [ -d ~/bin ]; then |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
4 | export PATH="$HOME/bin:$PATH" |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
5 | fi |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
6 | |
42 | 7 | if [ -d ~/.plenv ]; then |
8 | export PATH="$HOME/.plenv/bin:$PATH" | |
9 | eval "$( plenv init - )" | |
10 | fi | |
11 | ||
12 | if [ -d ~/.rbenv ]; then | |
13 | export PATH="$HOME/.rbenv/bin:$PATH" | |
14 | eval "$( rbenv init - )" | |
15 | fi | |
16 | ||
52
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
17 | |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
18 | if [ -x /usr/bin/xcompmgr ]; then |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
19 | /usr/bin/xcompmgr -n &>/dev/null </dev/null & |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
20 | fi |
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
21 | |
65
9c8f98eb7e1b
add xmodmap, move urxvtd until after xmodmap and defaults
Meredith Howard <mhoward@roomag.org>
parents:
57
diff
changeset
|
22 | /usr/bin/xmodmap ~/.xmodmaprc |
52
ab3e58416aa0
sync changeset 692d2b9c7958 from default
Meredith Howard <mhoward@roomag.org>
parents:
42
diff
changeset
|
23 | |
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
|
24 | if [ -r ~/.Xdefaults.local ]; then |
69 | 25 | /usr/bin/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
|
26 | 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
|
27 | |
65
9c8f98eb7e1b
add xmodmap, move urxvtd until after xmodmap and defaults
Meredith Howard <mhoward@roomag.org>
parents:
57
diff
changeset
|
28 | if [ -x /usr/bin/urxvtd ]; then |
9c8f98eb7e1b
add xmodmap, move urxvtd until after xmodmap and defaults
Meredith Howard <mhoward@roomag.org>
parents:
57
diff
changeset
|
29 | /usr/bin/urxvtd -q -o -f |
9c8f98eb7e1b
add xmodmap, move urxvtd until after xmodmap and defaults
Meredith Howard <mhoward@roomag.org>
parents:
57
diff
changeset
|
30 | fi |
9c8f98eb7e1b
add xmodmap, move urxvtd until after xmodmap and defaults
Meredith Howard <mhoward@roomag.org>
parents:
57
diff
changeset
|
31 | |
42 | 32 | if [ -r ~/.xsessionrc.local ]; then |
33 | . ~/.xsessionrc.local | |
34 | fi | |
35 |