diff options
| -rw-r--r-- | .arduino/preferences.txt | 98 | ||||
| -rw-r--r-- | .config/SuperCollider/sc_ide_conf.yaml | 106 | ||||
| -rw-r--r-- | .config/SuperCollider/startup.scd | 7 | ||||
| -rw-r--r-- | .config/SuperCollider/startupfiles/electronicStudio.scd | 49 | ||||
| -rw-r--r-- | .config/SuperCollider/startupfiles/rme_fireface800.scd | 8 | ||||
| -rw-r--r-- | .config/compton.conf | 14 | ||||
| -rwxr-xr-x | .config/conky/side | 2 | ||||
| -rw-r--r-- | .config/gtk-3.0/gtk.css | 14 | ||||
| -rw-r--r-- | .config/mpd/mpd-trvlr-jack.conf | 30 | ||||
| -rw-r--r-- | .config/mpd/mpd-trvlr.conf | 30 | ||||
| -rw-r--r-- | .config/mpd/mpd.conf | 2 | ||||
| -rw-r--r-- | .config/patchagerc | 19 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .offlineimaprc | 2 | ||||
| -rw-r--r-- | .processing/preferences.txt | 106 | ||||
| -rw-r--r-- | .scvimrc | 8 | ||||
| -rw-r--r-- | .tmux.conf | 15 | ||||
| -rw-r--r-- | .vdirsyncer/config | 1 | ||||
| -rw-r--r-- | .vim/addons.vim | 1 | ||||
| -rw-r--r-- | .zsh.after/export.zsh | 3 | ||||
| -rw-r--r-- | .zsh.after/functions.zsh | 10 | ||||
| -rw-r--r-- | .zsh.prompts/prompt_dvzrv_setup | 3 | ||||
| -rw-r--r-- | .zshenv | 7 |
23 files changed, 122 insertions, 414 deletions
diff --git a/.arduino/preferences.txt b/.arduino/preferences.txt deleted file mode 100644 index 27d7c03..0000000 --- a/.arduino/preferences.txt +++ /dev/null @@ -1,98 +0,0 @@ -board=uno -boardsmanager.additional.urls= -browser=mozilla -build.verbose=true -build.warn_data_percentage=75 -compiler.warning_level=none -console=true -console.auto_clear=true -console.error.file=stderr.txt -console.length=500 -console.lines=4 -console.output.file=stdout.txt -custom_cpu=diecimila_atmega328 -editor.antialias=false -editor.caret.blink=true -editor.code_folding=false -editor.divider.size=0 -editor.external=false -editor.font=Monospaced,plain,12 -editor.indent=true -editor.invalid=false -editor.keys.alternative_cut_copy_paste=true -editor.keys.home_and_end_beginning_end_of_doc=false -editor.keys.home_and_end_travel_far=false -editor.keys.shift_backspace_is_delete=true -editor.languages.current= -editor.linenumbers=false -editor.save_on_verify=true -editor.tabs.expand=true -editor.tabs.size=2 -editor.update_extension=true -editor.window.height.default=600 -editor.window.height.min=290 -editor.window.width.default=500 -editor.window.width.min=400 -export.applet.separate_jar_files=false -export.application.fullscreen=false -export.application.platform=true -export.application.stop=true -export.delete_target_folder=true -last.folder=/home/dave/git/sketchbooks/arduino-sketchbook/firmware/firmware.ino -last.ide.1.0.6.daterun=1411912958 -last.ide.1.0.6.hardwarepath=/usr/share/arduino/hardware -last.ide.1.6.0.daterun=1424022507 -last.ide.1.6.0.hardwarepath=/usr/share/arduino/hardware -last.ide.1.6.7.daterun=1456069632 -last.ide.1.6.7.hardwarepath=/usr/share/arduino/hardware -last.screen.height=768 -last.screen.width=1366 -last.serial.location=1277,707,1286,736 -last.sketch.count=1 -last.sketch0.location=-3,-5,1372,776,212,0 -last.sketch0.path=/home/dave/git/sketchbooks/arduino-sketchbook/firmware/firmware.ino -launcher=xdg-open -platform.auto_file_type_associations=true -preproc.color_datatype=true -preproc.enhanced_casting=true -preproc.imports.list=java.applet.*,java.awt.Dimension,java.awt.Frame,java.awt.event.MouseEvent,java.awt.event.KeyEvent,java.awt.event.FocusEvent,java.awt.Image,java.io.*,java.net.*,java.text.*,java.util.*,java.util.zip.*,java.util.regex.* -preproc.output_parse_tree=false -preproc.save_build_files=false -preproc.substitute_floats=true -preproc.substitute_unicode=true -preproc.web_colors=true -programmer=arduino:usbasp -proxy.manual.hostname= -proxy.manual.password= -proxy.manual.port= -proxy.manual.type=HTTP -proxy.manual.username= -proxy.pac.url= -proxy.type=auto -recent.sketches=/home/dave/git/sketchbooks/arduino-sketchbook/firmware/firmware.ino -run.display=1 -run.options= -run.options.memory=false -run.options.memory.initial=64 -run.options.memory.maximum=256 -run.present.bgcolor=#666666 -run.present.exclusive=false -run.present.stop.color=#cccccc -run.window.bgcolor=#DFDFDF -serial.databits=8 -serial.debug_rate=9600 -serial.parity=N -serial.port=/dev/ttyACM0 -serial.port.file=ttyACM0 -serial.stopbits=1 -sketchbook.path=/home/dave/git/sketchbooks/arduino-sketchbook/ -software=ARDUINO -target=arduino -target_package=arduino -target_platform=avr -update.check=true -update.id=-5111801774645063504 -update.last=1424022508963 -upload.using=bootloader -upload.verbose=true -upload.verify=true diff --git a/.config/SuperCollider/sc_ide_conf.yaml b/.config/SuperCollider/sc_ide_conf.yaml deleted file mode 100644 index 9fb139f..0000000 --- a/.config/SuperCollider/sc_ide_conf.yaml +++ /dev/null @@ -1,106 +0,0 @@ -IDE: - editor: - blinkDuration: 600 - font: - antialias: 2 - family: DejaVu Sans Mono - size: 10 - indentWidth: 4 - lineWrap: true - spaceIndent: false - stepForwardEvaluation: false - theme: My old theme - themes: - My old theme: - built-in: !textFormat - color: "#3333bf" - italic: false - char: !textFormat - color: "#007300" - italic: false - class: !textFormat - color: "#0000d2" - italic: false - comment: !textFormat - color: "#bf0000" - italic: false - currentLine: !textFormat - color: "#000000" - background: "#f4f4f4" - italic: false - env-var: !textFormat - color: "#8c4614" - italic: false - evaluatedCode: !textFormat - color: "#000000" - background: "#f8a200" - keyword: !textFormat - color: "#0000e6" - bold: true - italic: false - lineNumbers: !textFormat - {} - matchingBrackets: !textFormat - color: "#ff0000" - bold: true - mismatchedBrackets: !textFormat - color: "#ffffff" - background: "#960000" - italic: false - number: !textFormat - color: "#980099" - italic: false - postwindowemphasis: !textFormat - color: "#000000" - bold: true - italic: false - postwindowerror: !textFormat - color: "#d11c24" - italic: false - postwindowsuccess: !textFormat - color: "#738a05" - italic: false - postwindowtext: !textFormat - color: "#000000" - italic: false - postwindowwarning: !textFormat - color: "#a57706" - italic: false - primitive: !textFormat - color: "#3333bf" - italic: false - searchResult: !textFormat - color: "#7a7a7a" - background: "#36475a" - selection: !textFormat - {} - string: !textFormat - color: "#5f5f5f" - italic: false - symbol: !textFormat - color: "#007300" - italic: false - text: !textFormat - {} - whitespace: !textFormat - color: "#7f7f7f" - italic: false - interpreter: - autoStart: true - runtimeDir: "" - mainWindow: - detached: !QVariantMap - documents-dock: "" - help-dock: "" - post-dock: "" - geometry: AdnQywACAAAAAAAAAAAAEgAABVUAAAL/AAAAAgAAABQAAAVTAAAC/QAAAAACAAAABVY= - state: AAAA/wAAAAD9AAAAAgAAAAAAAAAAAAAAAPwCAAAAAfsAAAAcAGQAbwBjAHUAbQBlAG4AdABzAC0AZABvAGMAawAAAAAA/////wAAAF4A////AAAAAQAAAh4AAAK+/AIAAAAC+wAAABIAaABlAGwAcAAtAGQAbwBjAGsBAAAAEwAAAWQAAABMAP////sAAAASAHAAbwBzAHQALQBkAG8AYwBrAQAAAXgAAAFZAAAATAD///8AAAMzAAACvgAAAAEAAAACAAAAAQAAAAL8AAAAAA== - postWindow: - lineWrap: false - scrollback: 1000 - recentDocuments: !QVariantList - [] - shortcuts: - editor-document-next: Alt+K - editor-document-previous: Alt+J - startWithSession: last
\ No newline at end of file diff --git a/.config/SuperCollider/startup.scd b/.config/SuperCollider/startup.scd new file mode 100644 index 0000000..413d8b0 --- /dev/null +++ b/.config/SuperCollider/startup.scd @@ -0,0 +1,7 @@ + +Server.local.options.numOutputBusChannels = 2; +Server.local.options.numInputBusChannels = 2; + +if(("ls /dev/fw1".systemCmd) < 0, { + File.readInterpret(Platform.userConfigDir++"/startupfiles/rme_fireface800.scd"); +}); diff --git a/.config/SuperCollider/startupfiles/electronicStudio.scd b/.config/SuperCollider/startupfiles/electronicStudio.scd deleted file mode 100644 index b37b732..0000000 --- a/.config/SuperCollider/startupfiles/electronicStudio.scd +++ /dev/null @@ -1,49 +0,0 @@ -//Server.local.options.numOutputBusChannels = 12; // change number of input and output channels -Server.local.options.numOutputBusChannels = 8; // change number of input and output channels -Server.local.options.numInputBusChannels = 0;//8; -//Server.local.options.blockSize = 128; //256; // increase block size (default is 64) -Server.local.options.sampleRate = 41000; //96000; // increase sampling rate (if your hardware supports it) -Server.local.options.memSize = 6291456;//2097152; // 1048576; -Server.local.options.maxNodes = 65536; -//Server.local.options.maxSynthDefs = 16384; - -// hook up jack ports to audio channels -//"SC_JACK_DEFAULT_INPUTS".setenv( -//"rme_fireface:adat-01-in, -// rme_fireface:adat-02-in, -// rme_fireface:adat-03-in, -// rme_fireface:adat-04-in, -// rme_fireface:adat-05-in, -// rme_fireface:adat-06-in, -// rme_fireface:adat-07-in, -// rme_fireface:adat-08-in, -// rme_fireface:adat-09-in, -// rme_fireface:adat-10-in, -// rme_fireface:adat-11-in, -// rme_fireface:adat-12-in, -// rme_fireface:adat-13-in, -// rme_fireface:adat-14-in, -// rme_fireface:adat-15-in, -// rme_fireface:adat-16-in" -//); -//"SC_JACK_DEFAULT_OUTPUTS".setenv( -//"system" -//"firewire_pcm:0000a350026756bfa_pbk_analog-1_out" -//"rme_fireface:adat-01-out" -//"rme_fireface:adat-01-out, -// rme_fireface:adat-02-out, -// rme_fireface:adat-03-out, -// rme_fireface:adat-04-out, -// rme_fireface:adat-05-out, -// rme_fireface:adat-06-out, -// rme_fireface:adat-07-out, -// rme_fireface:adat-08-out, -// rme_fireface:adat-09-out, -// rme_fireface:adat-10-out, -// rme_fireface:adat-11-out, -// rme_fireface:adat-12-out, -// rme_fireface:adat-13-out, -// rme_fireface:adat-14-out, -// rme_fireface:adat-15-out, -// rme_fireface:adat-16-out" -//); diff --git a/.config/SuperCollider/startupfiles/rme_fireface800.scd b/.config/SuperCollider/startupfiles/rme_fireface800.scd new file mode 100644 index 0000000..2956e09 --- /dev/null +++ b/.config/SuperCollider/startupfiles/rme_fireface800.scd @@ -0,0 +1,8 @@ +Server.local.options.numOutputBusChannels = 28; +Server.local.options.numInputBusChannels = 28; +Server.local.options.blockSize = 128; //256; // increase block size (default is 64) +//Server.local.options.sampleRate = 41000; //96000; // increase sampling rate (if your hardware supports it) +//Server.local.options.memSize = 6291456;//2097152; // 1048576; +//Server.local.options.maxNodes = 65536; +//Server.local.options.maxSynthDefs = 16384; + diff --git a/.config/compton.conf b/.config/compton.conf index 378058e..1940a1a 100644 --- a/.config/compton.conf +++ b/.config/compton.conf @@ -4,9 +4,9 @@ no-dock-shadow = true; # Avoid drawing shadows on dock/panel windows. no-dnd-shadow = true; # Don't draw shadows on DND windows. clear-shadow = true; # Zero the part of the shadow's mask behind the # window. Fix some weirdness with ARGB windows. -shadow-radius = 7; # The blur radius for shadows. (default 12) -shadow-offset-x = -7; # The left offset for shadows. (default -15) -shadow-offset-y = -7; # The top offset for shadows. (default -15) +shadow-radius = 0; #5; # The blur radius for shadows. (default 12) +shadow-offset-x = 0; #-7; # The left offset for shadows. (default -15) +shadow-offset-y = 0; #-7; # The top offset for shadows. (default -15) # shadow-opacity = 0.7; # The translucency for shadows. (default .75) # shadow-red = 0.0; # Red color value of shadow. (0.0 - 1.0, defaults to 0) # shadow-green = 0.0; # Green color value of shadow. (0.0 - 1.0, defaults to 0) @@ -51,10 +51,10 @@ blur-background-exclude = [ # Exclude conditions for background blur. # Fading -fading = true; # Fade windows during opacity changes. -# fade-delta = 30; # The time between steps in a fade in milliseconds. (default 10). -fade-in-step = 0.03; # Opacity change between steps while fading in. (default 0.028). -fade-out-step = 0.03; # Opacity change between steps while fading out. (default 0.03). +#fading = true; # Fade windows during opacity changes. +fade-delta = 9; # The time between steps in a fade in milliseconds. (default 10). +fade-in-step = 0.02; # Opacity change between steps while fading in. (default 0.028). +fade-out-step = 0.02; # Opacity change between steps while fading out. (default 0.03). # no-fading-openclose = true; # Avoid fade windows in/out when opening/closing. fade-exclude = [ "name *= 'VLC'", diff --git a/.config/conky/side b/.config/conky/side index 5defca8..c6895e2 100755 --- a/.config/conky/side +++ b/.config/conky/side @@ -1,5 +1,3 @@ -use_xft yes -xftfont 123:size=8 xftalpha 0.1 background true total_run_times 0 diff --git a/.config/gtk-3.0/gtk.css b/.config/gtk-3.0/gtk.css index 5dead4a..efc4686 100644 --- a/.config/gtk-3.0/gtk.css +++ b/.config/gtk-3.0/gtk.css @@ -8,3 +8,17 @@ .titlebar { border-radius: 0; } + +.window-frame.csd.popup { + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); +} + +.header-bar { + background-image: none; + background-color: #ededed; + box-shadow: none; +} + +GtkLabel.title { + opacity: 0; +} diff --git a/.config/mpd/mpd-trvlr-jack.conf b/.config/mpd/mpd-trvlr-jack.conf new file mode 100644 index 0000000..7f4f9bb --- /dev/null +++ b/.config/mpd/mpd-trvlr-jack.conf @@ -0,0 +1,30 @@ +music_directory "/home/dave/.config/mpd/folders" +playlist_directory "/home/dave/.config/mpd/playlists" +db_file "/home/dave/.config/mpd/mpd.db" +log_file "/home/dave/.config/mpd/mpd.log" +pid_file "/home/dave/.config/mpd/mpd.pid" +state_file "/home/dave/.config/mpd/mpdstate" +bind_to_address "127.0.0.1" +port "6600" +gapless_mp3_playback "yes" +save_absolute_paths_in_playlists "yes" +#zeroconf_enabled "yes" +#zeroconf_name "dvzrv mpd" + +input { + plugin "curl" +} + +audio_output { + type "jack" + name "mpd" + mixer_type "software" +} + +audio_output { + type "fifo" + name "mpd_fifo" + path "/run/user/1000/mpd/fifo" + format "44100:16:2" +} + diff --git a/.config/mpd/mpd-trvlr.conf b/.config/mpd/mpd-trvlr.conf new file mode 100644 index 0000000..294d26a --- /dev/null +++ b/.config/mpd/mpd-trvlr.conf @@ -0,0 +1,30 @@ +music_directory "/home/dave/.config/mpd/folders" +playlist_directory "/home/dave/.config/mpd/playlists" +db_file "/home/dave/.config/mpd/mpd.db" +log_file "/home/dave/.config/mpd/mpd.log" +pid_file "/home/dave/.config/mpd/mpd.pid" +state_file "/home/dave/.config/mpd/mpdstate" +bind_to_address "127.0.0.1" +port "6600" +gapless_mp3_playback "yes" +save_absolute_paths_in_playlists "yes" +#zeroconf_enabled "yes" +#zeroconf_name "dvzrv mpd" + +input { + plugin "curl" +} + +audio_output { + type "pulse" + name "mpd" + mixer_type "software" +} + +audio_output { + type "fifo" + name "mpd_fifo" + path "/run/user/1000/mpd/fifo" + format "44100:16:2" +} + diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 294d26a..7f4f9bb 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -16,7 +16,7 @@ input { } audio_output { - type "pulse" + type "jack" name "mpd" mixer_type "software" } diff --git a/.config/patchagerc b/.config/patchagerc deleted file mode 100644 index ff1a691..0000000 --- a/.config/patchagerc +++ /dev/null @@ -1,19 +0,0 @@ -window_location 0 0 -window_size 958 1174 -zoom_level 0.960316 -font_size 11 -show_toolbar 1 -sprung_layout 1 -module_position "Midi Through" input 587 147 -module_position "Midi Through" output 102 147 -module_position "a2j" input 490 6322 -module_position "a2j" output 8 4787 -module_position "ardour" inputoutput 519 2431.5 -module_position "firewire_pcm" input 353.351 259.03 -module_position "firewire_pcm" output 45 2551.5 -module_position "gx_head_amp" inputoutput 726.598 297.735 -module_position "gx_head_fx" inputoutput 836.681 368.929 -module_position "nanoKONTROL2" input 579 77 -module_position "nanoKONTROL2" output 94 77 -module_position "nanoPAD2" input 595 8 -module_position "nanoPAD2" output 110 8 @@ -93,7 +93,6 @@ svn/ .config/Skype/ .config/SubDownloader/ .config/SuperCollider/sessions/ -.config/SuperCollider/startup.scd .config/Thunar/ .config/Trolltech.conf .config/Trolltech/ diff --git a/.offlineimaprc b/.offlineimaprc index c20c1db..7dafebf 100644 --- a/.offlineimaprc +++ b/.offlineimaprc @@ -1,5 +1,5 @@ [general] -accounts = sleepmap.de, tu-berlin.de, c-base.org, linuxaudio.org, studio@ak.tu-berlin.de +accounts = sleepmap.de,tu-berlin.de,c-base.org,linuxaudio.org,studio@ak.tu-berlin.de maxsyncaccounts = 3 pythonfile = ~/bin/pass2offlineimap diff --git a/.processing/preferences.txt b/.processing/preferences.txt deleted file mode 100644 index e2ca807..0000000 --- a/.processing/preferences.txt +++ /dev/null @@ -1,106 +0,0 @@ -buttons.hide.image=false -chooser.files.native=false -console.auto_clear=true -console.font.size=12 -console.length=500 -console.lines=4 -contribution.backup.on_install=true -contribution.backup.on_remove=true -editor.caret.blink=true -editor.caret.block=false -editor.completion.auto_close=false -editor.divider.size=0 -editor.font.family=Source Code Pro -editor.font.size=12 -editor.indent=true -editor.input_method_support=false -editor.keys.alternative_cut_copy_paste=true -editor.keys.home_and_end_travel_far=false -editor.keys.home_and_end_travel_smart=true -editor.keys.shift_backspace_is_delete=false -editor.laf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -editor.smooth=true -editor.tabs.expand=true -editor.tabs.size=2 -editor.token.comment1.style=#666666,plain -editor.token.comment2.style=#666666,plain -editor.token.function1.style=#006699,plain -editor.token.function2.style=#006699,plain -editor.token.function3.style=#669900,plain -editor.token.function4.style=#006699,bold -editor.token.invalid.style=#666666,bold -editor.token.keyword1.style=#33997e,plain -editor.token.keyword2.style=#33997e,plain -editor.token.keyword3.style=#669900,plain -editor.token.keyword4.style=#d94a7a,plain -editor.token.keyword5.style=#e2661a,plain -editor.token.keyword6.style=#33997e,plain -editor.token.label.style=#666666,bold -editor.token.literal1.style=#7D4793,plain -editor.token.literal2.style=#718a62,plain -editor.token.operator.style=#006699,plain -editor.untitled.prefix=sketch_ -editor.untitled.suffix=yyMMdd -editor.watcher=true -editor.watcher.debug=false -editor.watcher.window=1500 -editor.window.height.default=600 -editor.window.height.min=500 -editor.window.width.default=500 -editor.window.width.min=400 -export.application.embed_java=true -export.application.fullscreen=false -export.application.stop=true -export.delete_target_folder=true -header.hide.image=false -instance_server.key=0.4179917757909506 -instance_server.port=46037 -last.sketch.count=0 -last.sketch.mode=processing.mode.java.JavaMode -last.sketch.restore=true -launcher=xdg-open -mode.last=processing.mode.java.JavaMode -pdex.autoSave.autoSaveByDefault=true -pdex.autoSave.autoSaveEnabled=false -pdex.autoSave.promptDisplay=true -pdex.autoSaveInterval=5 -pdex.completion=false -pdex.completion.trigger=false -pdex.dbgOutput=false -pdex.errorCheckEnabled=true -pdex.suggest.imports=true -pdex.warningsEnabled=true -pdex.writeErrorLogs=false -platform.auto_file_type_associations=true -preproc.color_datatype=true -preproc.enhanced_casting=true -preproc.output_parse_tree=false -preproc.save_build_files=false -preproc.substitute_floats=true -preproc.substitute_unicode=true -preproc.web_colors=true -proxy.host= -proxy.http.host= -proxy.http.port= -proxy.https.host= -proxy.https.port= -proxy.port= -proxy.socks.host= -proxy.socks.port= -recent.count=10 -run.display=0 -run.options= -run.options.memory=false -run.options.memory.initial=64 -run.options.memory.maximum=256 -run.present.bgcolor=#666666 -run.present.stop.color=#cccccc -run.window.bgcolor=#DFDFDF -sketchbook.path=/home/dave/git/sketchbooks/processing-sketchbook -sketchbook.path.three=/home/dave/git/sketchbooks/processing-sketchbook -toolbar.hide.image=false -update.check=false -update.id=-2232603851351662427 -update.last=1395616194592 -welcome.seen=false -welcome.show=false @@ -3,24 +3,24 @@ 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 +let g:scvimSplitVertical = 0 " 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 +au BufWinEnter,BufNewFile,BufRead *.sc runtime ftplugin/supercollider.vim au BufWinEnter,BufNewFile,BufRead *.sc set sw=2 ts=2 autoindent "this line can be changed however you like "scd files: on open set runtimepath and start sclang au BufWinEnter,BufNewFile,BufRead *.scd set runtimepath+=/usr/share/vim/addons/ filetype=supercollider -au BufWinEnter,BufNewFile,BufRead *.scd let &iskeyword="@,48-57,_,192-255,-,|" | runtime ftplugin/supercollider.vim | SClangStart +au BufWinEnter,BufNewFile,BufRead *.scd runtime ftplugin/supercollider.vim | SClangStart au BufWinEnter,BufNewFile,BufRead *.scd set sw=2 ts=2 autoindent "sc help files au BufWinEnter,BufNewFile,BufRead *.schelp set filetype=supercollider -au BufWinEnter,BufNewFile,BufRead *.schelp let &iskeyword="@,48-57,_,192-255,-,|" | runtime ftplugin/supercollider.vim +au BufWinEnter,BufNewFile,BufRead *.schelp runtime ftplugin/supercollider.vim au BufWinEnter,BufNewFile,BufRead *.schelp set sw=2 ts=2 autoindent "this line can be changed however you like " ================ Indentation ====================== @@ -36,6 +36,9 @@ set -g history-limit 10000 # set mouse mode on set -g mouse on +# set the lock command to be vlock +set -g lock-command vlock + # Wheel scroll in pane unbind -T root WheelUpPane unbind -T root WheelDownPane @@ -80,12 +83,12 @@ set -g message-attr bold # set status-interval to 2 for tmux-mem-cpu-load set -g status-interval 1 set -g status-left '#[fg=colour235,bg=colour252,bold] #(hostname) #[fg=colour245,bg=colour238,bold] #(whoami) (#S) ' -set -g status-right '#[fg=colour23,bg=colour234]|>#[fg=white,bg=colour234]#(~/bin/get_cpu_status) \ -#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] #(~/bin/get_mem) \ -#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] #(~/bin/get_load) \ -#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] #(~/bin/get_battery_status) \ -#[fg=colour23,bg=colour234]<|>#[fg=white,bg=colour234] %Y%m%d (%a) \ -#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234] %H:%M:%S \ +set -g status-right '#[fg=colour23,bg=colour234]|>#[fg=white,bg=colour234]#(~/bin/get_cpu_status)\ +#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]#(~/bin/get_mem)\ +#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]#(~/bin/get_load)\ +#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]#(~/bin/get_battery_status)\ +#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]%Y%m%d/%a\ +#[fg=colour23,bg=colour234]|#[fg=white,bg=colour234]%H:%M:%S\ #[fg=colour23,bg=colour234]<|' set -g window-status-format '#[fg=colour235,bg=colour252,bold] #I: #W ' set -g window-status-current-format '#[fg=black,bg=colour23,noreverse,bold] #I: #W ' diff --git a/.vdirsyncer/config b/.vdirsyncer/config index f506d79..c183b0a 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -60,6 +60,7 @@ password.fetch = ["command", "~/bin/pass2vdirsyncer", "dave", "cloud.sleepmap.de a = akt_calendar_local b = akt_calendar_remote collections = ["ak_shared_by_mvoigt", "rechencluster_shared_by_mvoigt", "labs_shared_by_mvoigt", "akurlaub_shared_by_mvoigt", "grossesstudio_shared_by_mvoigt", "kleinesstudio_shared_by_mvoigt", "studioausleihe_shared_by_mvoigt", "studiotermine_shared_by_mvoigt"] +conflict_resolution = "b wins" [storage akt_calendar_local] type = filesystem diff --git a/.vim/addons.vim b/.vim/addons.vim index 747aed2..e198487 100644 --- a/.vim/addons.vim +++ b/.vim/addons.vim @@ -14,7 +14,6 @@ VAMActivate github:honza/vim-snippets VAMActivate github:garbas/vim-snipmate VAMActivate github:gerw/vim-latex-suite VAMActivate github:stevearc/vim-arduino -VAMActivate github:sophacles/vim-processing VAMActivate github:Matt-Stevens/vim-systemd-syntax VAMActivate github:sjas/octave.vim VAMActivate github:wannesm/wmgraphviz.vim.git diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh index 866f20d..01d2e48 100644 --- a/.zsh.after/export.zsh +++ b/.zsh.after/export.zsh @@ -7,6 +7,9 @@ fi # use de_DE.UTF-8 to get 24h format export LC_TIME=de_DE.UTF-8 +# keyboard exports for sway +export XKB_DEFAULT_LAYOUT=de + # browser export BROWSER=firefox export REPORTTIME=5 diff --git a/.zsh.after/functions.zsh b/.zsh.after/functions.zsh index c9ea095..7908f71 100644 --- a/.zsh.after/functions.zsh +++ b/.zsh.after/functions.zsh @@ -169,9 +169,13 @@ function publish() { mute popd } -function securium { - port=44350 - chromium --proxy-server="socks://localhost:$port" & +function incognichrome { + chromium --incognito + exit +} + +function inproxychrome { + chromium --incognito --proxy-server=apu-serve:8123 exit } diff --git a/.zsh.prompts/prompt_dvzrv_setup b/.zsh.prompts/prompt_dvzrv_setup index 4758b7a..c4093b7 100644 --- a/.zsh.prompts/prompt_dvzrv_setup +++ b/.zsh.prompts/prompt_dvzrv_setup @@ -82,9 +82,6 @@ function prompt_steeef_simplified_setup { zstyle ':vcs_info:*:prompt:*' formats "${branch_format}" zstyle ':vcs_info:*:prompt:*' nvcsformats "" - # Set python-info parameters. - zstyle ':prezto:module:python:info:virtualenv' format '(%v)' - # Define prompts. PROMPT="$(ssh_connection)${_prompt_steeef_simplified_colors[3]}%n%f@${_prompt_steeef_simplified_colors[2]}%m%f ${_prompt_steeef_simplified_colors[5]}%~%f "'${vcs_info_msg_0_}'"$ " RPROMPT="%(?..[%F{red}%?%f] )" @@ -1,10 +1,3 @@ -# -# Defines environment variables. -# -# Authors: -# Sorin Ionescu <sorin.ionescu@gmail.com> -# - # Ensure that a non-login, non-interactive shell has a defined environment. if [[ "$SHLVL" -eq 1 && ! -o LOGIN && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then source "${ZDOTDIR:-$HOME}/.zprofile" |