diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | .scvimrc | 6 | ||||
| -rw-r--r-- | .tmux.conf | 9 | ||||
| -rw-r--r-- | .vundles.local | 2 | ||||
| -rw-r--r-- | .zsh.after/aliases.zsh | 1 | ||||
| -rw-r--r-- | .zsh.after/unixpool | 30 | ||||
| -rwxr-xr-x | bin/start_jack | 2 |
7 files changed, 35 insertions, 18 deletions
@@ -40,9 +40,11 @@ Music/ Pictures/ Videos/ backup/ +build/ git/ ownCloud/ yankring_history_v2.txt +svn/ .ICEauthority .Mathematica/ @@ -258,6 +260,7 @@ yankring_history_v2.txt .processing/ .profile .pryrc +.pulse .pulse-cookie .python-eggs/ .q3a/ @@ -2,6 +2,12 @@ let g:sclangKillOnExit = 1 let g:sclangTerm = "urxvt -e" let g:sclangPipeLoc = "/tmp/sclang-pipe" let g:sclangPipeAppPidLoc = "/tmp/sclangpipe_app-pid" +" Set 1 to split scvim in tmux and screen vertically, 0 for horizontally +let g:scvimSplitVertical = 1 +" Set the size of the sclang output split in lines or blocks (only for scvim opened in screen and +" tmux). This setting applies vertically or horizontally, depending on +" g:scvimSplitVertical +let g:scvimSplitSize = 25 au BufWinEnter,BufNewFile,BufRead *.sc set filetype=supercollider au BufWinEnter,BufNewFile,BufRead *.sc let &iskeyword="@,48-57,_,192-255" | runtime ftplugin/supercollider.vim @@ -62,7 +62,6 @@ setw -g mode-mouse on - # Keep your finger on ctrl, or don't bind-key ^D detach-client @@ -73,6 +72,14 @@ set -g status-keys vi # Use vi keybindings in copy and choice modes setw -g mode-keys vi +# v and y like vi in copy-mode +bind-key -t vi-copy 'v' begin-selection +bind-key -t vi-copy 'y' copy-selection +# clipboard settings +set -s set-clipboard on +bind-key C-p run "xclip -o | tmux load-buffer - ; tmux paste-buffer" +bind-key C-y run "tmux save-buffer - | xclip -i" + # set first window to index 1 (not 0) to map more to the keyboard layout... set -g base-index 1 diff --git a/.vundles.local b/.vundles.local index 0f02485..b020552 100644 --- a/.vundles.local +++ b/.vundles.local @@ -9,4 +9,4 @@ Bundle "sophacles/vim-processing" "latex Bundle "vim-scripts/LaTeX-Suite-aka-Vim-LaTeX" "octave -Bundle "sjas/octave.vim" +Bundle "sjas/octave.vim"
\ No newline at end of file diff --git a/.zsh.after/aliases.zsh b/.zsh.after/aliases.zsh index 76c8689..7659e00 100644 --- a/.zsh.after/aliases.zsh +++ b/.zsh.after/aliases.zsh @@ -30,6 +30,7 @@ alias llt='ls -ltr' alias la='ls -A' alias lla='ls -lA' alias lsfw='ls -lah /dev|grep fw' +alias lsvid='ls -lah /dev|grep video' #grep aliases (with excluded directories) alias grepdot='grep -rI --exclude-dir=".steam" --exclude-dir=".local" --exclude-dir=".thunderbird" --exclude-dir=".mozilla" --exclude-dir="git" --exclude-dir=".rvm" --exclude-dir=".log" --exclude-dir=".dropbox-dist" --exclude-dir=".config" ' diff --git a/.zsh.after/unixpool b/.zsh.after/unixpool index d3498a1..e2edade 100644 --- a/.zsh.after/unixpool +++ b/.zsh.after/unixpool @@ -49,23 +49,23 @@ fi ## FUNCTIONS function music_update() { - echo "updating zip files" - for i in */*; - do - name=`echo $i | sed 's/\ /_/g' | sed 's/\//-/g'` - if [ ! -e $name.zip ]; - then - echo "packing $i as $name.zip" - zip -r $name.zip $i - fi - done - echo "done" + echo "updating zip files" + for i in */*; + do + name=`echo $i | sed 's/\ /_/g' | sed 's/\//-/g'` + if [ ! -e $name.zip ]; + then + echo "packing $i as $name.zip" + zip -r $name.zip $i + fi + done + echo "done" } function makantine() { - wget http://personalkantine.personalabteilung.tu-berlin.de/pdf/MA-aktuell.pdf -O /tmp/makantine.$$.pdf >&/dev/null - xpdf -cont -z page /tmp/makantine.$$.pdf - rm -f /tmp/makantine.$$.pdf + wget http://personalkantine.personalabteilung.tu-berlin.de/pdf/MA-aktuell.pdf -O /tmp/makantine.$$.pdf >&/dev/null + xpdf -cont -z page /tmp/makantine.$$.pdf + rm -f /tmp/makantine.$$.pdf } function pxeln() { @@ -121,5 +121,5 @@ function pxeln() { } function mailhighscore() { - for i in /homes/wheel/*; do n=`basename $i`; echo `grep $n /var/spool/mail/konni | grep -c From` $n; done | sort -nr + for i in /homes/wheel/*; do n=`basename $i`; echo `grep $n /var/spool/mail/runge | grep -c From` $n; done | sort -nr } diff --git a/bin/start_jack b/bin/start_jack index d28733c..48e97ed 100755 --- a/bin/start_jack +++ b/bin/start_jack @@ -13,7 +13,7 @@ case "$HOSTNAME" in EXTERNAL="card 1" if [[ "$CARDS" == *$EXTERNAL* ]];then echo "Starting with external USB card" - /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p128 -n3 -s &> ~/.log/jackd.log & + /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p2048 -n3 -s &> ~/.log/jackd.log & else echo "Starting with internal HDMI card" /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:0,0 -p128 -n3 -s &> ~/.log/jackd.log & |