diff options
| author | David Runge <david.runge@frqrec.com> | 2014-06-17 16:14:19 +0200 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-06-17 16:14:19 +0200 |
| commit | cde6bd16bb48f0aecf98b656a9dcfef629e24d95 (patch) | |
| tree | 2fa89aff5efa703597710368dece60913befaf71 /bin/autostart | |
| parent | ac876bcfe938849005309a2cb5da01451094c81c (diff) | |
| parent | 3b44361df3ede6208faa6fc97d584d33889dedf5 (diff) | |
| download | dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.gz dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.bz2 dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.xz dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.zip | |
Merge branch 'master' of https://github.com/davezerave/dot
Merging local and work settings for additional vundles
* 'master' of https://github.com/davezerave/dot:
Adding bindings for vi-copy mode in tmux
Adding more work related ignores
Adding octave support
Retabbing, customizing to my user
Adding more bbb specific JACK settings
Conflicts:
.vundles.local
Diffstat (limited to 'bin/autostart')
| -rwxr-xr-x | bin/autostart | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/autostart b/bin/autostart index fbd3f8d..9d70ad0 100755 --- a/bin/autostart +++ b/bin/autostart @@ -1,7 +1,7 @@ #!/bin/bash # Auto starting various programs post lightdm -export DISPLAY=:0.0 +export DISPLAY=:0 export XAUTHORITY=/home/dave/.Xauthority KERNEL_NAME=$(uname -r) @@ -14,9 +14,9 @@ if [[ "$KERNEL_NAME" != *rt* ]]; then else dropbox start & fi - pulseaudio --start & - nm-applet & - firewall-applet & +# pulseaudio --start & +# nm-applet & +# firewall-applet & else pulseaudio --kill & qjackctl & |