equal
deleted
inserted
replaced
1 #!/bin/bash |
1 #!/bin/bash |
2 |
2 |
3 if [[ -f ~/.bashenv ]]; then |
3 if [[ -f ~/.env ]]; then |
4 . ~/.bashenv |
4 . ~/.env |
5 fi |
5 fi |
6 # Load custom settings (user editable). |
6 # Load custom settings (user editable). |
7 if [[ -f ~/.bash_custom ]]; then |
7 if [[ -f ~/.env.local ]]; then |
8 . ~/.bash_custom |
8 . ~/.env.local |
9 fi |
9 fi |
10 |
10 |
11 if [[ -f ~/.Xdefaults ]]; then |
11 if [[ -f ~/.Xdefaults ]]; then |
12 xrdb -merge ~/.Xdefaults |
12 xrdb -merge ~/.Xdefaults |
13 # xrdb -load ~/.Xdefaults |
13 # xrdb -load ~/.Xdefaults |