diff options
| -rw-r--r-- | .arduino/preferences.txt | 16 | ||||
| -rw-r--r-- | .config/SuperCollider/sc_ide_conf.yaml | 131 | ||||
| -rwxr-xr-x | .config/conky/side | 2 | ||||
| -rw-r--r-- | .config/gtk-3.0/settings.ini | 2 | ||||
| -rw-r--r-- | .config/psd/.psd.conf | 67 | ||||
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | .mutt/david.runge@campus.tu-berlin.de.sig | 13 | ||||
| -rw-r--r-- | .processing/language.txt | 1 | ||||
| -rw-r--r-- | .tmux.conf | 24 | ||||
| -rwxr-xr-x | bin/get_battery_status | 27 | ||||
| -rwxr-xr-x | bin/get_cpu_status | 10 | ||||
| -rwxr-xr-x | bin/get_load | 8 | ||||
| -rwxr-xr-x | bin/sclang | 8 |
13 files changed, 155 insertions, 160 deletions
diff --git a/.arduino/preferences.txt b/.arduino/preferences.txt index 28ebc18..27d7c03 100644 --- a/.arduino/preferences.txt +++ b/.arduino/preferences.txt @@ -43,13 +43,13 @@ 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=1453680150 +last.ide.1.6.7.daterun=1456069632 last.ide.1.6.7.hardwarepath=/usr/share/arduino/hardware -last.screen.height=1440 -last.screen.width=2560 +last.screen.height=768 +last.screen.width=1366 last.serial.location=1277,707,1286,736 last.sketch.count=1 -last.sketch0.location=1277,-2,1286,1445,632,0 +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 @@ -61,7 +61,7 @@ preproc.save_build_files=false preproc.substitute_floats=true preproc.substitute_unicode=true preproc.web_colors=true -programmer=arduino:stk500 +programmer=arduino:usbasp proxy.manual.hostname= proxy.manual.password= proxy.manual.port= @@ -82,10 +82,10 @@ run.window.bgcolor=#DFDFDF serial.databits=8 serial.debug_rate=9600 serial.parity=N -serial.port=/dev/ttyUSB0 -serial.port.file=ttyUSB0 +serial.port=/dev/ttyACM0 +serial.port.file=ttyACM0 serial.stopbits=1 -sketchbook.path=/home/dave/git/sketchbooks/arduino-sketchbook +sketchbook.path=/home/dave/git/sketchbooks/arduino-sketchbook/ software=ARDUINO target=arduino target_package=arduino diff --git a/.config/SuperCollider/sc_ide_conf.yaml b/.config/SuperCollider/sc_ide_conf.yaml index b15ee2b..9fb139f 100644 --- a/.config/SuperCollider/sc_ide_conf.yaml +++ b/.config/SuperCollider/sc_ide_conf.yaml @@ -1,55 +1,90 @@ IDE: editor: blinkDuration: 600 - colors: - evaluatedCode: !textFormat - color: "#000000" - background: "#f8a200" - lineNumbers: !textFormat - {} - matchingBrackets: !textFormat - color: "#ff0000" - bold: true - mismatchedBrackets: !textFormat - color: "#ffffff" - background: "#960000" - searchResult: !textFormat - color: "#7a7a7a" - background: "#36475a" - selection: !textFormat - {} - text: !textFormat - {} font: antialias: 2 family: DejaVu Sans Mono size: 10 - highlighting: - built-in: !textFormat - color: "#3333bf" - char: !textFormat - color: "#007300" - class: !textFormat - color: "#0000d2" - comment: !textFormat - color: "#bf0000" - env-var: !textFormat - color: "#8c4614" - keyword: !textFormat - color: "#0000e6" - bold: true - number: !textFormat - color: "#980099" - primitive: !textFormat - color: "#3333bf" - string: !textFormat - color: "#5f5f5f" - symbol: !textFormat - color: "#007300" 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: "" @@ -58,21 +93,13 @@ IDE: documents-dock: "" help-dock: "" post-dock: "" - geometry: AdnQywABAAAAAAAAAAAAAAAABP8AAAMIAAAAAAAAAC0AAAN/AAADTAAAAAACAA== - state: AAAA/wAAAAD9AAAAAgAAAAAAAAAAAAAAAPwCAAAAAfsAAAAcAGQAbwBjAHUAbQBlAG4AdABzAC0AZABvAGMAawAAAAAA/////wAAAGMA////AAAAAQAAAlsAAAK//AIAAAAC+wAAABIAaABlAGwAcAAtAGQAbwBjAGsBAAAAFQAAAhIAAABMAP////sAAAASAHAAbwBzAHQALQBkAG8AYwBrAQAAAigAAACsAAAATAD///8AAAKkAAACvwAAAAEAAAACAAAAAQAAAAL8AAAAAA== + geometry: AdnQywACAAAAAAAAAAAAEgAABVUAAAL/AAAAAgAAABQAAAVTAAAC/QAAAAACAAAABVY= + state: AAAA/wAAAAD9AAAAAgAAAAAAAAAAAAAAAPwCAAAAAfsAAAAcAGQAbwBjAHUAbQBlAG4AdABzAC0AZABvAGMAawAAAAAA/////wAAAF4A////AAAAAQAAAh4AAAK+/AIAAAAC+wAAABIAaABlAGwAcAAtAGQAbwBjAGsBAAAAEwAAAWQAAABMAP////sAAAASAHAAbwBzAHQALQBkAG8AYwBrAQAAAXgAAAFZAAAATAD///8AAAMzAAACvgAAAAEAAAACAAAAAQAAAAL8AAAAAA== postWindow: lineWrap: false scrollback: 1000 recentDocuments: !QVariantList - - /home/dave/.config/SuperCollider/startup.scd - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/scoreTick.scd - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/scoreTest.scd - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/HabitSynth.sc - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/HabitScheduler.sc - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/habits - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/habit.scd - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/Habit.sc - - /home/dave/Dropbox/tu-berlin/courses/SE Time and space perceptions in sound installations/habits/HabitTimer.sc + [] shortcuts: editor-document-next: Alt+K editor-document-previous: Alt+J diff --git a/.config/conky/side b/.config/conky/side index 830e407..5defca8 100755 --- a/.config/conky/side +++ b/.config/conky/side @@ -92,7 +92,7 @@ ${color5} Network:\ ${if_up wlp3s0} ${color1} wlp3s0: ${color3}${addr wlp3s0} ${color1} net: ${color3}${exec iwgetid | cut -d ":" -f2} -${color1} ext: ${color3}${exec dig +short myip.opendns.com @resolver1.opendns.com} +${color1} ext: ${color3}${execpi 360 dig +short myip.opendns.com @resolver1.opendns.com} ${color1} gway: ${color3}${exec route -n | grep wlp3s0 | grep UG | awk '{print $2}'} ${color1} dns: ${color3}${exec grep "nameserver" /etc/resolv.conf | awk '{print $2}'} ${color1} speed: ${color3}${exec iwconfig wlp3s0 | grep "Bit Rate" | cut -d"=" -f2 | cut -d" " -f1} Mb/s diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 39ca34a..d88b031 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,6 +1,4 @@ [Settings] -gtk-application-prefer-dark-theme=1 gtk-fallback-icon-theme = gnome gtk-recent-files-max-age=0 gtk-recent-files-limit=0 -#gtk-decoration-layout=menu: diff --git a/.config/psd/.psd.conf b/.config/psd/.psd.conf deleted file mode 100644 index 68c26c5..0000000 --- a/.config/psd/.psd.conf +++ /dev/null @@ -1,67 +0,0 @@ -# -# $XDG_HOME_CONFIG/psd/psd.conf -# -# For documentation, refer to the psd man page or the wiki page -# https://wiki.archlinux.org/index.php/Profile-sync-daemon - -## NOTE the following: -## To protect data from corruption, in the event that you do make an edit while -## psd is active, any changes made will be applied the next time you start psd. - -# Uncomment and set to "yes" to use overlayfs instead of a full copy to reduce -# the memory costs and to improve sync/unsync operations. Note that your kernel -# MUST have this module available in order to use this mode -# -#USE_OVERLAYFS="no" - -# List browsers separated by spaces to include in the sync. Useful if you do not -# wish to have all possible browser profiles sync'ed which is the default if -# this variable is left commented. -# -# Possible values: -# chromium -# chromium-dev -# conkeror.mozdev.org -# epiphany -# firefox -# firefox-trunk -# google-chrome -# google-chrome-beta -# google-chrome-unstable -# heftig-aurora -# icecat -# inox -# luakit -# midori -# opera -# opera-beta -# opera-developer -# opera-legacy -# otter-browser -# qupzilla -# palemoon -# rekonq -# seamonkey -# vivaldi -# vivaldi-snapshot -# -BROWSERS="firefox chromium" - -# Define where browser profiles will reside in tmpfs if $XDG_RUNTIME_DIR isn't -# defined. This location must be mounted to tmpfs and MUST have permissions -# of at least 700. -# Use NO trailing backslash! -# -# Suggested locations based on distro defaults: -# Arch Linux/Chakra, Fedora, and Gentoo leave this commented out -# Debian 8+ use a setting of "/dev/shm" -# Ubuntu 15.05+ use "/dev/shm" -VOLATILE="/tmp/dave" - -# Uncomment and set to "no" to completely disable the crash recovery feature. -# -# The default is to create crash recovery backups if the system is ungracefully -# powered-down due to a kernel panic, hitting the reset switch, battery going -# dead, etc. Some users keep very diligent backups and don't care to have this -# feature enabled. -#USE_BACKUPS="yes" @@ -58,6 +58,8 @@ svn/ .aprc .arduino/console .arduino/recent.txt +.arduino/library* +.arduino/package* .armagetronad/ .audacity-data/ .avidemux/ @@ -82,6 +84,7 @@ svn/ .config/Cadence/ .config/EgoSoft/ .config/Fidra/ +.config/IJHack/ .config/ImageMagick/ .config/MusE/ .config/Mumble/ @@ -147,6 +150,7 @@ svn/ .config/octave/ .config/pavucontrol.ini .config/pd-extended/ +.config/psd/.psd.conf .config/pulse/ .config/pure-data/ .config/q4wine @@ -303,6 +307,7 @@ svn/ .pki/ .profile .processing/console +.processing/debug/ .processing/recent.txt .pryrc .pulse @@ -359,6 +364,7 @@ svn/ .viminfo .viminfo.tmp .vmoviedb/ +.weather/ .wine .wireshark/ .wolf3d/ diff --git a/.mutt/david.runge@campus.tu-berlin.de.sig b/.mutt/david.runge@campus.tu-berlin.de.sig index 3a5497f..11f7cdd 100644 --- a/.mutt/david.runge@campus.tu-berlin.de.sig +++ b/.mutt/david.runge@campus.tu-berlin.de.sig @@ -1,11 +1,18 @@ David Runge Elektronisches Studio, Fachgebiet Audiokommunikation +Electronic Music Studio, Audio Communication Group Technische Universität Berlin Fakultät I Geistes- und Bildungswissenschaften Institut für Sprache und Kommunikation -Einsteinufer 17c, Sekr. E-N 8, 10587 Berlin -Website: http://www.ak.tu-berlin.de/studio +Faculty I Humanities +Institute of Speech and Communication + +Einsteinufer 17c, Sekr. E-N 8, 10587 Berlin +Germany +Tel: +493031422327 +Fax: +493031421143 E-Mail: studio@ak.tu-berlin.de -Telefon: +493031422327 + +http://www.ak.tu-berlin.de/studio diff --git a/.processing/language.txt b/.processing/language.txt new file mode 100644 index 0000000..2c4c454 --- /dev/null +++ b/.processing/language.txt @@ -0,0 +1 @@ +en
\ No newline at end of file @@ -80,7 +80,7 @@ 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] CPU:#{cpu_percentage}, Battery: #{battery_percentage} #[fg=colour23,bg=colour234]<||>#[fg=white,bg=colour234] %H:%M:%S #[fg=colour23,bg=colour234]<|' +set -g status-right '#[fg=colour23,bg=colour234]|>#[fg=white,bg=colour234] #(~/bin/get_cpu_status) (#(~/bin/get_load)) #(~/bin/get_battery_status) #[fg=colour23,bg=colour234]<|>#[fg=white,bg=colour234] %Y%m%d #[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 ' @@ -109,25 +109,3 @@ bind r source-file ~/.tmux.conf # Swap windows bind-key m command-prompt -p "move window to:" "swap-window -t '%%'" - -# List of plugins -# Supports `github_username/repo` or full git repo URLs -set -g @tpm_plugins ' \ - tmux-plugins/tpm \ - tmux-plugins/tmux-sensible \ - tmux-plugins/tmux-cpu \ - tmux-plugins/tmux-yank \ - tmux-plugins/tmux-open \ - tmux-plugins/tmux-battery \ - tmux-plugins/tmux-logging \ - tmux-plugins/tmux-online-status \ - tmux-plugins/tmux-sidebar \ - ' -# Other examples: -# github_username/plugin_name \ -# git@github.com/user/plugin \ -# git@bitbucket.com/user/plugin \ - -# Initializes TMUX plugin manager. -# Keep this line at the very bottom of tmux.conf. -run-shell '~/.tmux/plugins/tpm/tpm' diff --git a/bin/get_battery_status b/bin/get_battery_status new file mode 100755 index 0000000..5ad18ce --- /dev/null +++ b/bin/get_battery_status @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +set -euo pipefail +IFS=$'\n\t' + +acpi_output="" +battery_number=0 +battery_percentage=0 +battery_remaining="" + +if [ -x /usr/bin/acpi ]; then + acpi_output=$(/usr/bin/acpi -b) + battery_number=$(echo $acpi_output|cut -d':' -f1|cut -d' ' -f2) + battery_state=$(echo $acpi_output|cut -d' ' -f3) + battery_state=${battery_state%","} + battery_percentage=$(echo $acpi_output|cut -d' ' -f4) + battery_percentage=${battery_percentage%","} + battery_percentage=${battery_percentage%"%"} + if [ $battery_state = "Discharging" ]; then + battery_remaining=$(echo $acpi_output|cut -d' ' -f5) + echo "$battery_percentage% ($battery_remaining)" + else + echo "$battery_percentage%" + fi +else + exit 1 +fi + diff --git a/bin/get_cpu_status b/bin/get_cpu_status new file mode 100755 index 0000000..2aece18 --- /dev/null +++ b/bin/get_cpu_status @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -euo pipefail +IFS=$'\n\t' + +proc_output="" + +proc_output=$(grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {printf("%5.1f", usage)}') +proc_output=${proc_output#" "} + +echo "$proc_output%" diff --git a/bin/get_load b/bin/get_load new file mode 100755 index 0000000..7991d26 --- /dev/null +++ b/bin/get_load @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +set -euo pipefail +IFS=$'\n\t' + +uptime_output=$(uptime| cut -d',' -f4,5,6|cut -d':' -f2) +uptime_output=${uptime_output#" "} + +echo "$uptime_output" @@ -1,10 +1,10 @@ #!/bin/sh # If not running my laptop (with X screen), run sclang in a xvfb environment. # This ensures getting around a bug with QPixmaps that needs a X server to run. -if [[ $HOSTNAME == *dvzrv* ]]; then - echo "/usr/bin/sclang" - /usr/bin/sclang "$@" -else +if [[ $HOSTNAME == *pitheunlord* ]]; then echo "/usr/bin/sclang in fake X screen" /usr/bin/xvfb-run -s "-screen 1, 1280x800x24" -a -e ~/.log/xvfb-run-sclang.error /usr/bin/sclang "$@" +else + echo "/usr/bin/sclang" + /usr/bin/sclang "$@" fi |