diff --git a/conky/conky/clock.conkyrc b/conky/conky/clock.conkyrc
deleted file mode 100644
index 45aabf0..0000000
--- a/conky/conky/clock.conkyrc
+++ /dev/null
@@ -1,254 +0,0 @@
-# Conky, a system monitor, based on torsmo
-#
-# Any original torsmo code is licensed under the BSD license
-#
-# All code written since the fork of torsmo is licensed under the GPL
-#
-# Please see COPYING for details
-#
-# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
-# All rights reserved.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-
-###############################################################################
-
-
-alignment middle_right
-
-# gap between window and screen borders
-gap_x 100
-gap_y 60
-
-# do not fork to the background after startup
-background no
-
-# margin between border and text in pixels
-border_inner_margin 0
-
-# margin between border and edge of the window pixels
-border_outer_margin 0
-
-# border width in pixels
-border_width 0
-
-# the number of samples to average for CPU monitoring
-cpu_avg_samples 2
-
-# no borders around text
-draw_borders no
-
-# white text with black outline
-default_outline_color black #\#e16b40
-default_color white
-
-# number of samples to average for I/O monitoring
-diskio_avg_samples 2
-
-# enable double buffering to prevent flickering
-double_buffer yes
-
-# borders around graphs
-draw_graph_borders yes
-
-# draw outline around letters
-draw_outline yes
-
-# no shades
-draw_shades no
-
-# no extra newline at the end when writing to stdout
-extra_newline no
-
-# print byte values in human readable form
-format_human_readable yes
-
-# do not break lines
-max_text_width 0
-
-# constant width of 300 pixels
-#maximum_width 300
-minimum_size 300 0
-
-# do not count buffers as used memory
-no_buffers yes
-
-# only output in X
-out_to_console no
-out_to_ncurses no
-out_to_stderr no
-out_to_x yes
-
-# force utf-8
-override_utf8_locale yes
-
-# create an own window to draw to
-own_window yes
-
-# set window class and title
-own_window_class Conky
-own_window_title Conky
-
-# use transparency (no real transparency)
-own_window_transparent yes
-
-# will be ignored if own_window_type is override
-#own_window_hints none
-
-# window will not be controlled by the window manager, hints are ignored
-own_window_type override
-
-# pad percents to two decimals (let's hope 100% will no occur too often)
-pad_percents 2
-
-# shorten units to a single letter, e.g. GiB -> G
-short_units yes
-
-# do not show value and time range in graphs
-show_graph_range no
-show_graph_scale no
-
-# use celsius for temperature units
-temperature_unit celsius
-
-# do not use seconds for time units, but the default h/m/s scheme
-times_in_seconds no
-
-# total number of times for Conky to update before quitting
-# zero makes Conky run forever
-total_run_times 0
-
-# the update interval in seconds
-update_interval 1.0
-update_interval_on_battery 1.0
-
-# render text in uppercase?
-uppercase no
-
-# adds spaces around certain objects to stop them from moving
-# other things around
-use_spacer left
-
-# enables anti-aliased font for example
-use_xft yes
-
-###############################################################################
-
-
-
-# Possible variables to be used:
-#
-# Variable Arguments Description
-#
-# acpiacadapter ACPI ac adapter state.
-# acpifan ACPI fan state
-# acpitemp ACPI temperature.
-# adt746xcpu CPU temperature from therm_adt746x
-# adt746xfan Fan speed from therm_adt746x
-# battery (num) Remaining capasity in ACPI or APM
-# battery. ACPI battery number can be
-# given as argument (default is BAT0).
-# buffers Amount of memory buffered
-# cached Amount of memory cached
-# color (color) Change drawing color to color
-# cpu CPU usage in percents
-# cpubar (height) Bar that shows CPU usage, height is
-# bar's height in pixels
-# downspeed net Download speed in kilobytes
-# downspeedf net Download speed in kilobytes with one
-# decimal
-# exec shell command Executes a shell command and displays
-# the output in torsmo. warning: this
-# takes a lot more resources than other
-# variables. I'd recommend coding wanted
-# behaviour in C and posting a patch :-).
-# execi interval, shell Same as exec but with specific interval.
-# command Interval can't be less than
-# update_interval in configuration.
-# fs_bar (height), (fs) Bar that shows how much space is used on
-# a file system. height is the height in
-# pixels. fs is any file on that file
-# system.
-# fs_free (fs) Free space on a file system available
-# for users.
-# fs_free_perc (fs) Free percentage of space on a file
-# system available for users.
-# fs_size (fs) File system size
-# fs_used (fs) File system used space
-# hr (height) Horizontal line, height is the height in
-# pixels
-# i2c (dev), type, n I2C sensor from sysfs (Linux 2.6). dev
-# may be omitted if you have only one I2C
-# device. type is either in (or vol)
-# meaning voltage, fan meaning fan or temp
-# meaning temperature. n is number of the
-# sensor. See /sys/bus/i2c/devices/ on
-# your local computer.
-# kernel Kernel version
-# loadavg (1), (2), (3) System load average, 1 is for past 1
-# minute, 2 for past 5 minutes and 3 for
-# past 15 minutes.
-# machine Machine, i686 for example
-# mails Mail count in mail spool. You can use
-# program like fetchmail to get mails from
-# some server using your favourite
-# protocol. See also new_mails.
-# mem Amount of memory in use
-# membar (height) Bar that shows amount of memory in use
-# memmax Total amount of memory
-# memperc Percentage of memory in use
-# new_mails Unread mail count in mail spool.
-# nodename Hostname
-# outlinecolor (color) Change outline color
-# pre_exec shell command Executes a shell command one time before
-# torsmo displays anything and puts output
-# as text.
-# processes Total processes (sleeping and running)
-# running_processes Running processes (not sleeping),
-# requires Linux 2.6
-# shadecolor (color) Change shading color
-# stippled_hr (space), Stippled (dashed) horizontal line
-# (height)
-# swapbar (height) Bar that shows amount of swap in use
-# swap Amount of swap in use
-# swapmax Total amount of swap
-# swapperc Percentage of swap in use
-# sysname System name, Linux for example
-# time (format) Local time, see man strftime to get more
-# information about format
-# totaldown net Total download, overflows at 4 GB on
-# Linux with 32-bit arch and there doesn't
-# seem to be a way to know how many times
-# it has already done that before torsmo
-# has started.
-# totalup net Total upload, this one too, may overflow
-# updates Number of updates (for debugging)
-# upspeed net Upload speed in kilobytes
-# upspeedf net Upload speed in kilobytes with one
-# decimal
-# uptime Uptime
-# uptime_short Uptime in a shorter format
-#
-# seti_prog Seti@home current progress
-# seti_progbar (height) Seti@home current progress bar
-# seti_credit Seti@hoome total user credit
-
-
-TEXT
-${font Ubuntu:size=112:light}${alignr}${time %R}${font}
-${alignr}${font Ubuntu:size=30:light}__________________________________________________________${font}
-
-${font Ubuntu:size=30:light}${alignr}${time %A, %d %B %Y}${font}
-
diff --git a/i3/i3/config b/i3/i3/config
index fc58b20..4a2bec7 100644
--- a/i3/i3/config
+++ b/i3/i3/config
@@ -375,5 +375,5 @@ bar {
}
i3bar_command i3bar
- status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/scripts/statusbar.conkyrc
+ status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/conky/statusbar.conkyrc
}
diff --git a/i3/i3/scripts/statusbar.conkyrc b/i3/i3/conky/statusbar.conkyrc
similarity index 100%
rename from i3/i3/scripts/statusbar.conkyrc
rename to i3/i3/conky/statusbar.conkyrc
diff --git a/i3/i3/scripts/battery.bash b/i3/i3/scripts/battery.bash
old mode 100644
new mode 100755
diff --git a/i3/i3/scripts/i3bar_wrapper.bash b/i3/i3/scripts/i3bar_wrapper.bash
index b777eeb..3afe0c3 100755
--- a/i3/i3/scripts/i3bar_wrapper.bash
+++ b/i3/i3/scripts/i3bar_wrapper.bash
@@ -1,60 +1,9 @@
#!/usr/bin/env bash
-# From http://i3wm.org/docs/user-contributed/conky-i3bar.html
-
-# the height of the i3bar in pixels. used to align the yad windows.
-I3BAR_HEIGHT=24
-
-# the width of the screen in pixels.
-X_MAX=1920
-
# paths to scripts used.
-PA_VOLUME_SCRIPT="$HOME/.i3/scripts/pa-volume.bash"
-I3BAR_UPDATE="$HOME/.i3/scripts/update-status.bash"
-LOGFILE="$LOGDIR/i3/i3log_wrapper.log"
-SCRIPTS_SYSINFO="$HOME/.i3/scripts/status.d/sysinfo.bash"
-SCRIPTS_WIRELESS="$HOME/.i3/scripts/status.d/wireless.bash"
-SCRIPTS_BATTERY="$HOME/.i3/scripts/status.d/battery.bash"
-SCRIPTS_PACMAN="$HOME/.i3/scripts/status.d/pacman.bash"
-PIDFILE="$LOGDIR/i3/conky.pid"
-
-COLOR_FG="#FFFFFF"
-COLOR_BG="#222222"
-
-GTK_THEME="/usr/share/themes/Boje-Greyscale/gtk-2.0/gtkrc"
-YAD_PREFIX="GTK2_RC_FILES=$GTK_THEME"
-
-FONT="DejaVu Sans Mono 11"
-
-echo > "$LOGFILE"
-
-log() {
- echo "[$(date +%FT%T)] $*" >> "$LOGFILE"
-}
-
-log "START"
-
-update() {
- bash $I3BAR_UPDATE
-}
-
-get_x() {
- x=$1
- width=$2
- pos=$(( $x - ($width / 2) ))
- if [[ $(( $pos + $width )) -gt $X_MAX ]] ; then
- log "window would exceed the right screen border. adjusting"
- pos=$(( $X_MAX - $width ))
- fi
- echo $pos
-}
-
-# I'm sorry.
-getval() {
- echo $(echo "$1" | grep -Po "\"$2\":.*?," | awk -F ':' '{print $2}' | tr -d '",')
-}
-
path_conkyrc="$1"
+_PIDFILE="$RUNDIR/i3/conky.pid"
+
# end the header so that i3bar knows we want to use JSON:
echo '{ "version" : 1 , "click_events" : true }'
@@ -68,138 +17,8 @@ echo '[],'
# Now send blocks with information forever:
conky -c "$path_conkyrc" &
-echo $! > "$PIDFILE"
+pid=$!
-while read line ; do
- # This part must not produce any output to stdout as this would be sent
- # to i3bar and crash it due to wrong formatting.
+printf '%s' $pid > "$_PIDFILE"
- log "line: $line"
- [[ "$line" == "[" ]] && continue
-
- name="$(getval "$line" "name")"
- log "name: $name"
-
- case "$name" in
-
- "mpd_toggle")
- mpc toggle 1>/dev/null 2>&1
- ;;
- "pacman")
- width=500
- height=700
- x=$(get_x $(getval "$line" "x") $width)
- bash "$SCRIPTS_PACMAN" | env $YAD_PREFIX yad \
- --text-info \
- --class=yad-status \
- --button !gtk-apply:0 \
- --button "update"!go-down:1 \
- --button "reload"!gtk-refresh:2 \
- --buttons-layout center \
- --fore "$COLOR_FG" \
- --back "$COLOR_BG" \
- --fontname="$FONT" \
- --geometry ${width}x${height}+${x}+${I3BAR_HEIGHT}
- button=$?
- if [[ $button == 1 ]] ; then
- log "update requested"
- urxvt -e sudo pacman -Syu
- elif [[ $button == 2 ]] ; then
- log "packagelist reload requested"
- urxvt -e sudo pacman -Sy
- fi
- ;;
- "wireless")
- width=500
- height=700
- x=$(get_x $(getval "$line" "x") $width)
- bash "$SCRIPTS_WIRELESS" | env $YAD_PREFIX yad \
- --text-info \
- --class=yad-status \
- --button !gtk-apply:0 \
- --buttons-layout center \
- --fore "$COLOR_FG" \
- --back "$COLOR_BG" \
- --fontname="$FONT" \
- --geometry ${width}x${height}+${x}+${I3BAR_HEIGHT}
- ;;
- "battery")
- width=250
- height=150
- x=$(get_x $(getval "$line" "x") $width)
- bash "$SCRIPTS_BATTERY" | env $YAD_PREFIX yad \
- --text-info \
- --class=yad-status \
- --button !gtk-apply:0 \
- --buttons-layout center \
- --fore "$COLOR_FG" \
- --back "$COLOR_BG" \
- --fontname="$FONT" \
- --geometry ${width}x${height}+${x}+${I3BAR_HEIGHT}
- ;;
- "time")
- width=300
- height=0
- x=$(get_x $(getval "$line" "x") $width)
- env $YAD_PREFIX yad \
- --calendar \
- --class=yad-status \
- --button !gtk-apply:0 \
- --buttons-layout center \
- --geometry ${width}x${height}+${x}+${I3BAR_HEIGHT} >/dev/null
- ;;
- "mpd_status")
- mpc toggle
- ;;
- "sysinfo")
- # i should rather write an extra script
- width=600
- height=800
- x=$(get_x $(getval "$line" "x") $width)
- bash "$SCRIPTS_SYSINFO" | env $YAD_PREFIX yad \
- --text-info \
- --class=yad-status \
- --button !gtk-apply:0 \
- --buttons-layout center \
- --fore "$COLOR_FG" \
- --back "$COLOR_BG" \
- --fontname="$FONT" \
- --geometry ${width}x${height}+${x}+${I3BAR_HEIGHT}
- ;;
- "volume")
- width=300
- height=0
- x=$(get_x $(getval "$line" "x") $width)
- vol=$(bash $PA_VOLUME_SCRIPT get-vol)
- log "got current volume: $vol"
- is_muted=$(bash $PA_VOLUME_SCRIPT is-muted)
- if [[ "$is_muted" == 0 ]] ; then
- button_mute_text="mute"
- else
- button_mute_text="unmute"
- fi
- newvol=$(env $YAD_PREFIX yad \
- --text=Volume: \
- --scale \
- --class=yad-status \
- --button !gtk-apply:0 \
- --button !gtk-cancel:1 \
- --button ${button_mute_text}!:2 \
- --buttons-layout center \
- --value $vol \
- --text-align center \
- --min-value 0 \
- --max-value 100 \
- --step 1 \
- --geometry ${width}x${height}+${x}+${I3BAR_HEIGHT}
- )
- button=$?
- if [[ $button == 2 ]] ; then
- bash $PA_VOLUME_SCRIPT mute-toggle
- elif [[ $button == 0 ]] ; then
- bash $PA_VOLUME_SCRIPT set-vol $newvol
- fi
- ;;
- esac
-
-done
+wait $pid
diff --git a/i3/i3/scripts/update-status.bash b/i3/i3/scripts/update-status.bash
index 5ec00f6..71e7d01 100755
--- a/i3/i3/scripts/update-status.bash
+++ b/i3/i3/scripts/update-status.bash
@@ -1 +1 @@
-kill -SIGUSR1 $(cat $LOGDIR/i3/conky.pid)
+kill -USR1 $(cat $RUNDIR/i3/conky.pid)
diff --git a/mpd/mpd/mpd.conf b/mpd/mpd/mpd.conf
deleted file mode 100644
index 7f98da8..0000000
--- a/mpd/mpd/mpd.conf
+++ /dev/null
@@ -1,453 +0,0 @@
-# An example configuration file for MPD.
-# Read the user manual for documentation: http://www.musicpd.org/doc/user/
-
-
-# Files and directories #######################################################
-#
-# This setting controls the top directory which MPD will search to discover the
-# available audio files and add them to the daemon's online database. This
-# setting defaults to the XDG directory, otherwise the music directory will be
-# be disabled and audio files will only be accepted over ipc socket (using
-# file:// protocol) or streaming files over an accepted protocol.
-#
-music_directory "/media/shared/music/library"
-#
-# This setting sets the MPD internal playlist directory. The purpose of this
-# directory is storage for playlists created by MPD. The server will use
-# playlist files not created by the server but only if they are in the MPD
-# format. This setting defaults to playlist saving being disabled.
-#
-playlist_directory "~/music/playlists/mpd"
-#
-# This setting sets the location of the MPD database. This file is used to
-# load the database at server start up and store the database while the
-# server is not up. This setting defaults to disabled which will allow
-# MPD to accept files over ipc socket (using file:// protocol) or streaming
-# files over an accepted protocol.
-#
-db_file "~/.var/lib/mpd/database"
-#
-# These settings are the locations for the daemon log files for the daemon.
-# These logs are great for troubleshooting, depending on your log_level
-# settings.
-#
-# The special value "syslog" makes MPD use the local syslog daemon. This
-# setting defaults to logging to syslog, otherwise logging is disabled.
-#
-log_file "~/.var/log/mpd/log"
-#
-# This setting sets the location of the file which stores the process ID
-# for use of mpd --kill and some init scripts. This setting is disabled by
-# default and the pid file will not be stored.
-#
-pid_file "~/.var/run/mpd.pid"
-#
-# This setting sets the location of the file which contains information about
-# most variables to get MPD back into the same general shape it was in before
-# it was brought down. This setting is disabled by default and the server
-# state will be reset on server start up.
-#
-state_file "~/.var/lib/mpd/state"
-#
-# The location of the sticker database. This is a database which
-# manages dynamic information attached to songs.
-#
-#sticker_file "~/.mpd/sticker.sql"
-#
-###############################################################################
-
-
-# General music daemon options ################################################
-#
-# This setting specifies the user that MPD will run as. MPD should never run as
-# root and you may use this setting to make MPD change its user ID after
-# initialization. This setting is disabled by default and MPD is run as the
-# current user.
-#
-#user "nobody"
-#
-# This setting specifies the group that MPD will run as. If not specified
-# primary group of user specified with "user" setting will be used (if set).
-# This is useful if MPD needs to be a member of group such as "audio" to
-# have permission to use sound card.
-#
-#group "nogroup"
-#
-# This setting sets the address for the daemon to listen on. Careful attention
-# should be paid if this is assigned to anything other then the default, any.
-# This setting can deny access to control of the daemon.
-#
-# For network
-bind_to_address "any"
-#
-# And for Unix Socket
-#bind_to_address "~/.mpd/socket"
-#
-# This setting is the TCP port that is desired for the daemon to get assigned
-# to.
-#
-port "6600"
-#
-# This setting controls the type of information which is logged. Available
-# setting arguments are "default", "secure" or "verbose". The "verbose" setting
-# argument is recommended for troubleshooting, though can quickly stretch
-# available resources on limited hardware storage.
-#
-log_level "default"
-#
-# If you have a problem with your MP3s ending abruptly it is recommended that
-# you set this argument to "no" to attempt to fix the problem. If this solves
-# the problem, it is highly recommended to fix the MP3 files with vbrfix
-# (available from ), at which
-# point gapless MP3 playback can be enabled.
-#
-gapless_mp3_playback "yes"
-#
-# Setting "restore_paused" to "yes" puts MPD into pause mode instead
-# of starting playback after startup.
-#
-restore_paused "yes"
-#
-# This setting enables MPD to create playlists in a format usable by other
-# music players.
-#
-#save_absolute_paths_in_playlists "no"
-#
-# This setting defines a list of tag types that will be extracted during the
-# audio file discovery process. The complete list of possible values can be
-# found in the mpd.conf man page.
-#metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc"
-#
-# This setting enables automatic update of MPD's database when files in
-# music_directory are changed.
-#
-auto_update "yes"
-#
-# Limit the depth of the directories being watched, 0 means only watch
-# the music directory itself. There is no limit by default.
-#
-#auto_update_depth "3"
-#
-###############################################################################
-
-
-# Symbolic link behavior ######################################################
-#
-# If this setting is set to "yes", MPD will discover audio files by following
-# symbolic links outside of the configured music_directory.
-#
-follow_outside_symlinks "yes"
-#
-# If this setting is set to "yes", MPD will discover audio files by following
-# symbolic links inside of the configured music_directory.
-#
-follow_inside_symlinks "yes"
-#
-###############################################################################
-
-
-# Zeroconf / Avahi Service Discovery ##########################################
-#
-# If this setting is set to "yes", service information will be published with
-# Zeroconf / Avahi.
-#
-#zeroconf_enabled "yes"
-#
-# The argument to this setting will be the Zeroconf / Avahi unique name for
-# this MPD server on the network.
-#
-#zeroconf_name "Music Player"
-#
-###############################################################################
-
-
-# Permissions #################################################################
-#
-# If this setting is set, MPD will require password authorization. The password
-# can setting can be specified multiple times for different password profiles.
-#
-#password "password@read,add,control,admin"
-#
-# This setting specifies the permissions a user has who has not yet logged in.
-#
-#default_permissions "read,add,control,admin"
-#
-###############################################################################
-
-
-# Database #######################################################################
-#
-
-#database {
-# plugin "proxy"
-# host "other.mpd.host"
-# port "6600"
-#}
-
-# Input #######################################################################
-#
-
-#input {
-# plugin "curl"
-# proxy "proxy.isp.com:8080"
-# proxy_user "user"
-# proxy_password "password"
-#}
-
-#
-###############################################################################
-
-# Audio Output ################################################################
-#
-# MPD supports various audio output types, as well as playing through multiple
-# audio outputs at the same time, through multiple audio_output settings
-# blocks. Setting this block is optional, though the server will only attempt
-# autodetection for one sound card.
-#
-# An example of an ALSA output:
-#
-#audio_output {
-# type "alsa"
-# name "My ALSA Device"
-## device "hw:0,0" # optional
-## mixer_type "hardware" # optional
-## mixer_device "default" # optional
-## mixer_control "PCM" # optional
-## mixer_index "0" # optional
-#}
-#
-# An example of an OSS output:
-#
-#audio_output {
-# type "oss"
-# name "My OSS Device"
-## device "/dev/dsp" # optional
-## mixer_type "hardware" # optional
-## mixer_device "/dev/mixer" # optional
-## mixer_control "PCM" # optional
-#}
-#
-# An example of a shout output (for streaming to Icecast):
-#
-#audio_output {
-# type "shout"
-# encoding "ogg" # optional
-# name "My Shout Stream"
-# host "localhost"
-# port "8000"
-# mount "/mpd.ogg"
-# password "hackme"
-# quality "5.0"
-# bitrate "128"
-# format "44100:16:1"
-## protocol "icecast2" # optional
-## user "source" # optional
-## description "My Stream Description" # optional
-## url "http://example.com" # optional
-## genre "jazz" # optional
-## public "no" # optional
-## timeout "2" # optional
-## mixer_type "software" # optional
-#}
-#
-# An example of a recorder output:
-#
-#audio_output {
-# type "recorder"
-# name "My recorder"
-# encoder "vorbis" # optional, vorbis or lame
-# path "/var/lib/mpd/recorder/mpd.ogg"
-## quality "5.0" # do not define if bitrate is defined
-# bitrate "128" # do not define if quality is defined
-# format "44100:16:1"
-#}
-#
-# An example of a httpd output (built-in HTTP streaming server):
-#
-#audio_output {
-# type "httpd"
-# name "mpd http stream"
-# encoder "lame" # optional, vorbis or lame
-# port "8000"
-## bind_to_address "localhost" # optional, IPv4 or IPv6
-# quality "5.0" # do not define if bitrate is defined
-## bitrate "128" # do not define if quality is defined
-# format "44100:16:1"
-# max_clients "0" # optional 0=no limit
-#}
-#
-# An example of a pulseaudio output (streaming to a remote pulseaudio server)
-#
-audio_output {
- type "pulse"
- name "mpd pulse"
-## server "remote_server" # optional
-## sink "remote_server_sink" # optional
-}
-#
-# This is necessary for visualization in ncmpcpp
-audio_output {
- type "fifo"
- name "visualizer feed"
- path "/tmp/mpd.fifo"
- format "44100:16:2"
-}
-#
-# An example of a winmm output (Windows multimedia API).
-#
-#audio_output {
-# type "winmm"
-# name "My WinMM output"
-## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
-# or
-## device "0" # optional
-## mixer_type "hardware" # optional
-#}
-#
-# An example of an openal output.
-#
-#audio_output {
-# type "openal"
-# name "My OpenAL output"
-## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
-#}
-#
-## Example "pipe" output:
-#
-#audio_output {
-# type "pipe"
-# name "my pipe"
-# command "aplay -f cd 2>/dev/null"
-## Or if you're want to use AudioCompress
-# command "AudioCompress -m | aplay -f cd 2>/dev/null"
-## Or to send raw PCM stream through PCM:
-# command "nc example.org 8765"
-# format "44100:16:2"
-#}
-#
-## An example of a null output (for no audio output):
-#
-#audio_output {
-# type "null"
-# name "My Null Output"
-# mixer_type "none" # optional
-#}
-#
-# If MPD has been compiled with libsamplerate support, this setting specifies
-# the sample rate converter to use. Possible values can be found in the
-# mpd.conf man page or the libsamplerate documentation. By default, this is
-# setting is disabled.
-#
-#samplerate_converter "Fastest Sinc Interpolator"
-#
-###############################################################################
-
-
-# Normalization automatic volume adjustments ##################################
-#
-# This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "off", "album", "track" or "auto". "auto" is a special mode that
-# chooses between "track" and "album" depending on the current state of
-# random playback. If random playback is enabled then "track" mode is used.
-# See for more details about ReplayGain.
-# This setting is off by default.
-#
-replaygain "auto"
-#
-# This setting sets the pre-amp used for files that have ReplayGain tags. By
-# default this setting is disabled.
-#
-#replaygain_preamp "0"
-#
-# This setting sets the pre-amp used for files that do NOT have ReplayGain tags.
-# By default this setting is disabled.
-#
-#replaygain_missing_preamp "0"
-#
-# This setting enables or disables ReplayGain limiting.
-# MPD calculates actual amplification based on the ReplayGain tags
-# and replaygain_preamp / replaygain_missing_preamp setting.
-# If replaygain_limit is enabled MPD will never amplify audio signal
-# above its original level. If replaygain_limit is disabled such amplification
-# might occur. By default this setting is enabled.
-#
-replaygain_limit "yes"
-#
-# This setting enables on-the-fly normalization volume adjustment. This will
-# result in the volume of all playing audio to be adjusted so the output has
-# equal "loudness". This setting is disabled by default.
-#
-#volume_normalization "no"
-#
-###############################################################################
-
-
-# MPD Internal Buffering ######################################################
-#
-# This setting adjusts the size of internal decoded audio buffering. Changing
-# this may have undesired effects. Don't change this if you don't know what you
-# are doing.
-#
-#audio_buffer_size "4096"
-#
-# This setting controls the percentage of the buffer which is filled before
-# beginning to play. Increasing this reduces the chance of audio file skipping,
-# at the cost of increased time prior to audio playback.
-#
-#buffer_before_play "10%"
-#
-###############################################################################
-
-
-# Resource Limitations ########################################################
-#
-# These settings are various limitations to prevent MPD from using too many
-# resources. Generally, these settings should be minimized to prevent security
-# risks, depending on the operating resources.
-#
-#connection_timeout "60"
-#max_connections "10"
-#max_playlist_length "16384"
-#max_command_list_size "2048"
-max_output_buffer_size "16384"
-#
-###############################################################################
-
-# Character Encoding ##########################################################
-#
-# If file or directory names do not display correctly for your locale then you
-# may need to modify this setting.
-#
-#filesystem_charset "UTF-8"
-#
-# This setting controls the encoding that ID3v1 tags should be converted from.
-#
-#id3v1_encoding "ISO-8859-1"
-#
-###############################################################################
-
-
-# SIDPlay decoder #############################################################
-#
-# songlength_database:
-# Location of your songlengths file, as distributed with the HVSC.
-# The sidplay plugin checks this for matching MD5 fingerprints.
-# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq
-#
-# default_songlength:
-# This is the default playing time in seconds for songs not in the
-# songlength database, or in case you're not using a database.
-# A value of 0 means play indefinitely.
-#
-# filter:
-# Turns the SID filter emulation on or off.
-#
-#decoder {
-# plugin "sidplay"
-# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt"
-# default_songlength "120"
-# filter "true"
-#}
-#
-###############################################################################
-
diff --git a/ncmpcpp/ncmpcpp/bindings b/ncmpcpp/ncmpcpp/bindings
deleted file mode 100644
index bedad3f..0000000
--- a/ncmpcpp/ncmpcpp/bindings
+++ /dev/null
@@ -1,519 +0,0 @@
-##########################################################
-## this is example bindings configuration file, copy it ##
-## to ~/.ncmpcpp/bindings and set up your preferences ##
-##########################################################
-##
-##### General rules #####
-##
-## 1) Because each action has runtime checks whether it's
-## ok to run it, a few actions can be bound to one key.
-## Actions will be bound in order given in configuration
-## file. When a key is pressed, first action in order
-## will test itself whether it's possible to run it. If
-## test succeeds, action is executed and other actions
-## bound to this key are ignored. If it doesn't, next
-## action in order tests itself etc.
-##
-## 2) It's possible to bind more that one action at once
-## to a key. It can be done using the following syntax:
-##
-## def_key "key"
-## action1
-## action2
-## ...
-##
-## This creates a chain of actions. When such chain is
-## executed, each action in chain is run until the end of
-## chain is reached or one of its actions fails to execute
-## due to its requirements not being met. If multiple actions
-## and/or chains are bound to the same key, they will be
-## consecutively run until one of them gets fully executed.
-##
-## 3) When ncmpcpp starts, bindings configuration file is
-## parsed and then ncmpcpp provides "missing pieces"
-## of default keybindings. If you want to disable some
-## bindings, there is a special action called 'dummy'
-## for that purpose. Eg. if you want to disable ability
-## to crop playlists, you need to put the following
-## into configuration file:
-##
-## def_key "C"
-## dummy
-##
-## After that ncmpcpp will not bind any default action
-## to this key.
-##
-## 4) To let you write simple macros, the following special
-## actions are provided:
-##
-## - push_character "character" - pushes given special
-## character into input queue, so it will be immediately
-## picked by ncmpcpp upon next call to readKey function.
-## Accepted values: mouse, up, down, page_up, page_down,
-## home, end, space, enter, insert, delete, left, right,
-## tab, shift_tab, ctrl_a, ctrl_b, ..., ctrl_z, f1, f2,
-## ..., f12, backspace, backspace_2.
-##
-## - push_characters "string" - pushes given string into
-## input queue.
-##
-## - require_runnable "action" - checks whether given action
-## is runnable and fails if it isn't. This is especially
-## useful when mixed with previous two functions. Consider
-## the following macro definition:
-##
-## def_key "key"
-## push_characters "custom_filter"
-## apply_filter
-##
-## If apply_filter can't be currently run, we end up with
-## sequence of characters in input queue which will be
-## treated just as we typed them. This may lead to unexpected
-## results (in this case 'c' will most likely clear current
-## playlist, 'u' will trigger database update, 's' will stop
-## playback etc.). To prevent such thing from happening, we
-## need to change above definition to this one:
-##
-## def_key "key"
-## require_runnable "apply_filter"
-## push_characters "custom_filter"
-## apply_filter
-##
-## Here, first we test whether apply_filter can be actually run
-## before we stuff characters into input queue, so if condition
-## is not met, whole chain is aborted and we're fine.
-##
-## - require_screen "screen" - checks whether given screen is
-## currently active. accepted values: browser, clock, help,
-## media_library, outputs, playlist, playlist_editor,
-## search_engine, tag_editor, visualizer, last_fm, lyrics,
-## selected_items_adder, server_info, song_info,
-## sort_playlist_dialog, tiny_tag_editor.
-##
-## - run_external_command "command" - runs given command using
-## system() function.
-##
-## 5) In addition to binding to a key, you can also bind actions
-## or chains of actions to a command. If it comes to commands,
-## syntax is very similar to defining keys. Here goes example
-## definition of a command:
-##
-## def_command "quit" [deferred]
-## stop
-## quit
-##
-## If you execute the above command (which can be done by
-## invoking action execute_command, typing 'quit' and pressing
-## enter), ncmpcpp will stop the player and then quit. Note the
-## presence of word 'deferred' enclosed in square brackets. It
-## tells ncmpcpp to wait for confirmation (ie. pressing enter)
-## after you typed quit. Instead of 'deferred', 'immediate'
-## could be used. Then ncmpcpp will not wait for confirmation
-## (enter) and will execute the command the moment it sees it.
-##
-## Note: Both 'backspace' and 'backspace_2' are used because some
-## terminals interpret backspace using keycode of 'backspace'
-## and some the one of 'backspace_2'. You can get away with
-## binding once if all your terminal emulators use the same
-## value.
-##
-## Note: There is a difference between:
-##
-## def_key "key"
-## action1
-##
-## def_key "key"
-## action2
-##
-## and
-##
-## def_key "key"
-## action1
-## action2
-##
-## First one binds two single actions to the same key whilst
-## second one defines a chain of actions. The behavior of
-## these two is different and is described in (1) and (2).
-##
-## Note: Function def_key accepts non-ascii characters.
-##
-##### List of unbound actions #####
-##
-## The following actions are not bound to any key/command:
-##
-## - set_volume
-## - filter_playlist_on_priorities
-##
-#
-#def_key "mouse"
-# mouse_event
-#
-def_key "up"
- scroll_up
-#
-def_key "down"
- scroll_down
-
-def_key "k"
- scroll_up
-
-def_key "j"
- scroll_down
-#
-#def_key "["
-# scroll_up_album
-#
-#def_key "]"
-# scroll_down_album
-#
-#def_key "{"
-# scroll_up_artist
-#
-#def_key "}"
-# scroll_down_artist
-#
-#def_key "page_up"
-# page_up
-#
-#def_key "page_down"
-# page_down
-#
-#def_key "home"
-# move_home
-#
-#def_key "end"
-# move_end
-#
-#def_key "space"
-# press_space
-#
-#def_key "enter"
-# press_enter
-#
-#def_key "delete"
-# delete_playlist_items
-#
-#def_key "delete"
-# delete_stored_playlist
-#
-#def_key "right"
-# next_column
-#
-#def_key "right"
-# slave_screen
-#
-#def_key "right"
-# volume_up
-#
-#def_key "+"
-# volume_up
-#
-#def_key "left"
-# previous_column
-#
-#def_key "left"
-# master_screen
-#
-#def_key "left"
-# volume_down
-#
-#def_key "-"
-# volume_down
-#
-#def_key ":"
-# execute_command
-#
-#def_key "tab"
-# next_screen
-#
-#def_key "shift_tab"
-# previous_screen
-#
-#def_key "f1"
-# show_help
-#
-#def_key "1"
-# show_playlist
-#
-#def_key "2"
-# show_browser
-#
-#def_key "2"
-# change_browse_mode
-#
-#def_key "3"
-# show_search_engine
-#
-#def_key "3"
-# reset_search_engine
-#
-#def_key "4"
-# show_media_library
-#
-#def_key "4"
-# toggle_media_library_columns_mode
-#
-#def_key "5"
-# show_playlist_editor
-#
-#def_key "6"
-# show_tag_editor
-#
-#def_key "7"
-# show_outputs
-#
-#def_key "8"
-# show_visualizer
-#
-#def_key "="
-# show_clock
-#
-#def_key "@"
-# show_server_info
-#
-#def_key "s"
-# stop
-#
-#def_key "p"
-# pause
-#
-#def_key ">"
-# next
-#
-#def_key "<"
-# previous
-#
-#def_key "ctrl_h"
-# jump_to_parent_directory
-#
-#def_key "ctrl_h"
-# replay_song
-#
-#def_key "backspace"
-# jump_to_parent_directory
-#
-#def_key "backspace"
-# replay_song
-#
-#def_key "backspace_2"
-# jump_to_parent_directory
-#
-#def_key "backspace_2"
-# replay_song
-#
-#def_key "f"
-# seek_forward
-#
-#def_key "b"
-# seek_backward
-#
-#def_key "r"
-# toggle_repeat
-#
-#def_key "z"
-# toggle_random
-#
-#def_key "y"
-# save_tag_changes
-#
-#def_key "y"
-# start_searching
-#
-#def_key "y"
-# toggle_single
-#
-#def_key "R"
-# toggle_consume
-#
-#def_key "Y"
-# toggle_replay_gain_mode
-#
-#def_key "t"
-# toggle_space_mode
-#
-#def_key "T"
-# toggle_add_mode
-#
-#def_key "|"
-# toggle_mouse
-#
-#def_key "#"
-# toggle_bitrate_visibility
-#
-#def_key "Z"
-# shuffle
-#
-#def_key "x"
-# toggle_crossfade
-#
-#def_key "X"
-# set_crossfade
-#
-#def_key "u"
-# update_database
-#
-#def_key "ctrl_v"
-# sort_playlist
-#
-#def_key "ctrl_r"
-# reverse_playlist
-#
-#def_key "ctrl_f"
-# apply_filter
-#
-#def_key "/"
-# find
-#
-#def_key "/"
-# find_item_forward
-#
-#def_key "?"
-# find
-#
-#def_key "?"
-# find_item_backward
-#
-#def_key "."
-# next_found_item
-#
-#def_key ","
-# previous_found_item
-#
-#def_key "w"
-# toggle_find_mode
-#
-#def_key "e"
-# edit_song
-#
-#def_key "e"
-# edit_library_tag
-#
-#def_key "e"
-# edit_library_album
-#
-#def_key "e"
-# edit_directory_name
-#
-#def_key "e"
-# edit_playlist_name
-#
-#def_key "e"
-# edit_lyrics
-#
-#def_key "i"
-# show_song_info
-#
-#def_key "I"
-# show_artist_info
-#
-#def_key "g"
-# jump_to_position_in_song
-#
-#def_key "l"
-# show_lyrics
-#
-#def_key "v"
-# reverse_selection
-#
-#def_key "V"
-# remove_selection
-#
-#def_key "B"
-# select_album
-#
-#def_key "a"
-# add_selected_items
-#
-#def_key "c"
-# clear_playlist
-#
-#def_key "c"
-# clear_main_playlist
-#
-#def_key "C"
-# crop_playlist
-#
-#def_key "C"
-# crop_main_playlist
-#
-#def_key "m"
-# move_sort_order_up
-#
-#def_key "m"
-# move_selected_items_up
-#
-#def_key "m"
-# toggle_media_library_sort_mode
-#
-#def_key "m"
-# set_visualizer_sample_multiplier
-#
-#def_key "n"
-# move_sort_order_down
-#
-#def_key "n"
-# move_selected_items_down
-#
-#def_key "M"
-# move_selected_items_to
-#
-#def_key "A"
-# add
-#
-#def_key "S"
-# save_playlist
-#
-#def_key "o"
-# jump_to_playing_song
-#
-#def_key "G"
-# jump_to_browser
-#
-#def_key "G"
-# jump_to_playlist_editor
-#
-#def_key "~"
-# jump_to_media_library
-#
-#def_key "E"
-# jump_to_tag_editor
-#
-#def_key "U"
-# toggle_playing_song_centering
-#
-#def_key "P"
-# toggle_display_mode
-#
-#def_key "\\"
-# toggle_interface
-#
-#def_key "!"
-# toggle_separators_between_albums
-#
-#def_key "L"
-# toggle_lyrics_fetcher
-#
-#def_key "F"
-# toggle_fetching_lyrics_in_background
-#
-#def_key "ctrl_l"
-# toggle_screen_lock
-#
-#def_key "`"
-# toggle_browser_sort_mode
-#
-#def_key "`"
-# toggle_library_tag_type
-#
-#def_key "`"
-# refetch_lyrics
-#
-#def_key "`"
-# add_random_items
-#
-#def_key "ctrl_p"
-# set_selected_items_priority
-#
-#def_key "q"
-# quit
-#
diff --git a/ncmpcpp/ncmpcpp/config b/ncmpcpp/ncmpcpp/config
deleted file mode 100644
index 0ed00e0..0000000
--- a/ncmpcpp/ncmpcpp/config
+++ /dev/null
@@ -1,511 +0,0 @@
-####################################################
-## this is example configuration file, copy it to ##
-## ~/.ncmpcpp/config and set up your preferences ##
-####################################################
-#
-##### directories ######
-##
-## Directory for storing ncmpcpp related files.
-## Changing it is useful if you want to store
-## everything somewhere else and provide command
-## line setting for alternative location to config
-## file which defines that while launching ncmpcpp.
-##
-#
-ncmpcpp_directory = ~/.ncmpcpp
-#
-##
-## Directory for storing downloaded lyrics. It
-## defaults to ~/.lyrics since other MPD clients
-## (eg. ncmpc) also use that location.
-##
-#
-lyrics_directory = ~/music/lyrics
-#
-##### connection settings #####
-#
-mpd_host = localhost
-#
-mpd_port = 6600
-#
-mpd_connection_timeout = 5
-#
-## Needed for tag editor and file operations to work.
-##
-mpd_music_dir = ~/music/library
-#
-mpd_crossfade_time = 5
-#
-##### music visualizer #####
-##
-## Note: In order to make music visualizer work you'll
-## need to use mpd fifo output, whose format parameter
-## has to be set to 44100:16:1 for mono visualization
-## or 44100:16:2 for stereo visualization. Example
-## configuration (it has to be put into mpd.conf):
-##
-## audio_output {
-## type "fifo"
-## name "Visualizer feed"
-## path "/tmp/mpd.fifo"
-## format "44100:16:2"
-## }
-##
-#
-visualizer_fifo_path = /tmp/mpd.fifo
-#
-##
-## Note: Below parameter is needed for ncmpcpp
-## to determine which output provides data for
-## visualizer and thus allow syncing between
-## visualization and sound as currently there
-## are some problems with it.
-##
-#
-visualizer_output_name = visualizer feed
-#
-##
-## If you set format to 44100:16:2, make it 'yes'.
-##
-visualizer_in_stereo = yes
-#
-##
-## Multiply received samples by given value. Very
-## useful for proper visualization of quiet music.
-##
-#visualizer_sample_multipler = 1
-#
-##
-## Note: Below parameter defines how often ncmpcpp
-## has to "synchronize" visualizer and audio outputs.
-## 30 seconds is optimal value, but if you experience
-## synchronization problems, set it to lower value.
-## Keep in mind that sane values start with >=10.
-##
-#
-visualizer_sync_interval = 30
-#
-##
-## Note: To enable spectrum frequency visualization
-## you need to compile ncmpcpp with fftw3 support.
-##
-#
-## Available values: spectrum, wave.
-##
-visualizer_type = spectrum
-#
-visualizer_look = ●▮
-#
-##### system encoding #####
-##
-## ncmpcpp should detect your charset encoding
-## but if it failed to do so, you can specify
-## charset encoding you are using here.
-##
-## Note: You can see whether your ncmpcpp build
-## supports charset detection by checking output
-## of `ncmpcpp --version`.
-##
-## Note: Since MPD uses UTF-8 by default, setting
-## this option makes sense only if your encoding
-## is different.
-##
-#
-#system_encoding = ""
-#
-##### delays #####
-#
-## Time of inactivity (in seconds) after playlist
-## highlighting will be disabled (0 = always on).
-##
-playlist_disable_highlight_delay = 0
-#
-## Defines how long messages are supposed to be visible.
-##
-message_delay_time = 5
-#
-##### song format #####
-##
-## for song format you can use:
-##
-## %l - length
-## %f - filename
-## %D - directory
-## %a - artist
-## %A - album artist
-## %t - title
-## %b - album
-## %y - date
-## %n - track number (01/12 -> 01)
-## %N - full track info (01/12 -> 01/12)
-## %g - genre
-## %c - composer
-## %p - performer
-## %d - disc
-## %C - comment
-## %P - priority
-## $R - begin right alignment
-##
-## you can also put them in { } and then it will be displayed
-## only if all requested values are available and/or define alternate
-## value with { }|{ } eg. {%a - %t}|{%f}
-##
-## Note: If you want to set limit on maximal length of a tag, just
-## put the appropriate number between % and character that defines
-## tag type, e.g. to make album take max. 20 terminal cells, use '%20b'.
-##
-## Note: Format that is similar to "%a - %t" (i.e. without any additional
-## braces) is equal to "{%a - %t}", so if one of the tags is missing,
-## you'll get nothing.
-##
-## text can also have different color than the main window has,
-## eg. if you want length to be green, write "$3%l$9".
-##
-## Available values:
-##
-## - 0 - default window color (discards all other colors)
-## - 1 - black
-## - 2 - red
-## - 3 - green
-## - 4 - yellow
-## - 5 - blue
-## - 6 - magenta
-## - 7 - cyan
-## - 8 - white
-## - 9 - end of current color
-##
-## Note: colors can be nested.
-##
-#
-song_list_format = {%a - }{%t}|{$8%f$9}$R{$3(%l)$9}
-#
-song_status_format = {{%a{ "%b"{ (%y)}} - }{%t}}|{%f}
-#
-song_library_format = {%n - }{%t}|{%f}
-#
-tag_editor_album_format = {(%y) }%b
-#
-##
-## Note: Below variables are used for sorting songs in browser.
-## The sort mode determines how songs are sorted, and can be used
-## in combination with a sort format to specify a custom sorting format.
-## Available values for browser_sort_mode are "name", "mtime", "format"
-## and "noop".
-##
-#
-browser_sort_mode = name
-#
-browser_sort_format = {%a - }{%t}|{%f} {(%l)}
-#
-##
-## Note: Below variables are for alternative version of user's interface.
-## Their syntax supports all tags and colors listed above plus some extra
-## markers used for text attributes. They are followed by character '$'.
-## After that you can put:
-##
-## - b - bold text
-## - u - underline text
-## - r - reverse colors
-## - a - use alternative character set
-##
-## If you don't want to use an attribute anymore, just put it again, but
-## this time insert character '/' between '$' and attribute character,
-## e.g. {$b%t$/b}|{$r%f$/r} will display bolded title tag or filename
-## with reversed colors.
-##
-#
-alternative_header_first_line_format = $b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b
-#
-alternative_header_second_line_format = {{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}}|{%D}
-#
-##
-## Note: below variables also support text attributes listed above.
-##
-#
-now_playing_prefix = $b
-#
-now_playing_suffix = $/b
-#
-browser_playlist_prefix = "$2playlist$9 "
-#
-selected_item_prefix = $6
-#
-selected_item_suffix = $9
-#
-modified_item_prefix = $3> $9
-#
-# Note: colors are not supported for below variable.
-##
-song_window_title_format = {%a - }{%t}|{%f}
-#
-##### columns settings #####
-##
-## syntax of song columns list format is "column column etc."
-##
-## - syntax for each column is:
-##
-## (width of column)[column's color]{displayed tag}
-##
-## Note: Width is by default in %, if you want a column to
-## have fixed size, add 'f' after the value, e.g. (10)[white]{a}
-## will be the column that take 10% of screen (so the real column's
-## width will depend on actual screen size), whereas (10f)[white]{a}
-## will take 10 terminal cells, no matter how wide the screen is.
-##
-## - color is optional (if you want the default one, type [])
-##
-## Note: You can give a column additional attributes by putting appropriate
-## character after displayed tag character. Available attributes are:
-##
-## - r - column will be right aligned
-## - E - if tag is empty, empty tag marker won't be displayed
-##
-## You can also:
-##
-## - give a column custom name by putting it after attributes,
-## separated with character ':', e.g. {lr:Length} gives you
-## right aligned column of lengths named "Length".
-##
-## - define sequence of tags, that have to be displayed in case
-## predecessor is empty in a way similar to the one in classic
-## song format, i.e. using '|' character, e.g. {a|c|p:Owner}
-## creates column named "Owner" that tries to display artist
-## tag and then composer and performer if previous ones are
-## not available.
-##
-#
-song_columns_list_format = (20)[]{a} (6f)[green]{NE} (50)[white]{t|f:Title} (20)[cyan]{b} (7f)[magenta]{l}
-#
-##### various settings #####
-#
-##
-## Note: Custom command that will be executed each
-## time song changes. Useful for notifications etc.
-##
-## Attention: It doesn't support song format anymore.
-## Use `ncmpcpp --now-playing SONG_FORMAT` instead.
-##
-#execute_on_song_change = ""
-#
-playlist_show_remaining_time = no
-#
-playlist_shorten_total_times = no
-#
-playlist_separate_albums = no
-#
-##
-## Note: Possible display modes: classic, columns.
-##
-playlist_display_mode = columns
-#
-browser_display_mode = columns
-#
-search_engine_display_mode = columns
-#
-playlist_editor_display_mode = columns
-#
-discard_colors_if_item_is_selected = yes
-#
-incremental_seeking = yes
-#
-seek_time = 1
-#
-volume_change_step = 2
-#
-autocenter_mode = no
-#
-centered_cursor = no
-#
-##
-## Note: You can specify third character which will
-## be used to build 'empty' part of progressbar.
-##
-progressbar_look = =|
-#
-progressbar_boldness = yes
-#
-## Available values: database, playlist.
-##
-default_place_to_search_in = database
-#
-## Available values: classic, alternative.
-##
-user_interface = alternative
-#
-data_fetching_delay = yes
-#
-## Available values: artist, album_artist, date, genre, composer, performer.
-##
-media_library_primary_tag = artist
-#
-## Available values: wrapped, normal.
-##
-default_find_mode = wrapped
-#
-## Available values: add, select.
-##
-default_space_mode = add
-#
-default_tag_editor_pattern = %n - %t
-#
-header_visibility = yes
-#
-statusbar_visibility = yes
-#
-titles_visibility = yes
-#
-header_text_scrolling = yes
-#
-cyclic_scrolling = no
-#
-lines_scrolled = 2
-#
-follow_now_playing_lyrics = no
-#
-fetch_lyrics_for_current_song_in_background = no
-#
-store_lyrics_in_song_dir = no
-#
-generate_win32_compatible_filenames = no
-#
-allow_for_physical_item_deletion = no
-#
-##
-## Note: If you set this variable, ncmpcpp will try to
-## get info from last.fm in language you set and if it
-## fails, it will fall back to english. Otherwise it will
-## use english the first time.
-##
-## Note: Language has to be expressed as an ISO 639 alpha-2 code.
-##
-lastfm_preferred_language = de
-#
-## Available values: add_remove, always_add.
-##
-space_add_mode = always_add
-#
-show_hidden_files_in_local_browser = no
-#
-##
-## How shall screen switcher work?
-##
-## - "previous" - switch between the current and previous screen.
-## - "screen1,...,screenN" - switch between given sequence of screens.
-##
-## Screens available for use: help, playlist, browser, search_engine,
-## media_library, playlist_editor, tag_editor, outputs, visualizer, clock.
-##
-screen_switcher_mode = playlist, browser
-#
-##
-## Note: You can define startup screen for ncmpcpp
-## by choosing screen from the list above.
-##
-startup_screen = playlist
-#
-##
-## Default width of locked screen (in %).
-## Acceptable values are from 20 to 80.
-##
-#
-locked_screen_width_part = 50
-#
-ask_for_locked_screen_width_part = yes
-#
-jump_to_now_playing_song_at_start = yes
-#
-ask_before_clearing_playlists = no
-#
-clock_display_seconds = no
-#
-display_volume_level = yes
-#
-display_bitrate = no
-#
-display_remaining_time = no
-#
-## Available values: none, basic, extended.
-##
-regular_expressions = extended
-#
-##
-## Note: If below is enabled, ncmpcpp will ignore leading
-## "The" word while sorting items in browser, tags in
-## media library, etc.
-##
-ignore_leading_the = yes
-#
-block_search_constraints_change_if_items_found = yes
-#
-mouse_support = yes
-#
-mouse_list_scroll_whole_page = yes
-#
-empty_tag_marker = [empty]
-#
-tags_separator = " | "
-#
-tag_editor_extended_numeration = no
-#
-media_library_sort_by_mtime = no
-#
-enable_window_title = yes
-#
-##
-## Note: You can choose default search mode for search
-## engine. Available modes are:
-##
-## - 1 - use mpd built-in searching (no regexes, pattern matching)
-## - 2 - use ncmpcpp searching (pattern matching with support for regexes,
-## but if your mpd is on a remote machine, downloading big database
-## to process it can take a while
-## - 3 - match only exact values (this mode uses mpd function for searching
-## in database and local one for searching in current playlist)
-##
-#
-search_engine_default_search_mode = 1
-#
-external_editor = vim
-#
-## Note: set to yes if external editor is a console application.
-##
-use_console_editor = yes
-#
-##### colors definitions #####
-#
-colors_enabled = yes
-#
-empty_tag_color = cyan
-#
-header_window_color = default
-#
-volume_color = default
-#
-state_line_color = default
-#
-state_flags_color = default
-#
-main_window_color = yellow
-#
-color1 = white
-#
-color2 = green
-#
-main_window_highlight_color = yellow
-#
-progressbar_color = black
-#
-progressbar_elapsed_color = green
-#
-statusbar_color = default
-#
-alternative_ui_separator_color = black
-#
-active_column_color = red
-#
-visualizer_color = yellow
-#
-window_border_color = green
-#
-active_window_border = red
-#
diff --git a/scripts/setup.bash b/scripts/setup.bash
index d35d982..9dc26b6 100755
--- a/scripts/setup.bash
+++ b/scripts/setup.bash
@@ -14,7 +14,7 @@ backup_dir="$HOME/.dotfiles.bak/"
# the following folders inside $config_dir will be inspected and the
# contents symlinked:
-symlink_folders='git i3 vim zsh conky x mpd ncmpcpp tmux'
+symlink_folders='git i3 vim zsh x tmux'
MAPPING_SEPARATOR='::'
@@ -86,5 +86,4 @@ done
# copy everything from the skel directory into $HOME, but do not overwrite anything
# the /. at the end of source is some cp magic that copies the content of a directory
# instead of the directory inself
-echo "cp -a --no-clobber \"$skel_dir/.\" \"$HOME\""
-[[ $dryrun ]] || cp -a --no-clobber "$skel_dir/." "$HOME"
+[[ $dryrun ]] || rsync --archive --verbose --ignore-existing "$skel_dir/" "$HOME"
diff --git a/skel/.var/lib/mpd/.gitignore b/skel/.var/lib/mpd/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/skel/.var/log/mpd/.gitignore b/skel/.var/log/mpd/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/x/xinitrc b/x/xinitrc
index b67594a..8606a3a 100755
--- a/x/xinitrc
+++ b/x/xinitrc
@@ -113,19 +113,6 @@ seafile-applet & &>> $LOGFILE
xset -dpms & &>> $LOGFILE
xset s off & &>> $LOGFILE
-
-xrandr --output eDP1 --primary
-
-# execute the host-specific .xinitrc-addition
-hostfile="$HOME/.xinitrc.d/$(hostname --short).xinitrc"
-log "looking for host specific xinitrc addition at $hostfile"
-if [[ -f "$hostfile" ]] ; then
- log "found it. executing"
- bash "$hostfile" & &>> $LOGFILE
-else
- log "found none"
-fi
-
if [[ -f ~/.Xresources ]] ; then
log "found ~/.Xresources, merging it into xrdb"
xrdb -merge ~/.Xresources &>> $LOGFILE
diff --git a/x/xinitrc.d/netbook.xinitrc b/x/xinitrc.d/netbook.xinitrc
deleted file mode 100755
index 7d55437..0000000
--- a/x/xinitrc.d/netbook.xinitrc
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# enable vertical edge scrolling
-synclient VertEdgeScroll=1
-
-xrandr --output LVDS-0 --primary
diff --git a/x/xinitrc.d/notebook.xinitrc b/x/xinitrc.d/notebook.xinitrc
deleted file mode 100644
index 62035d8..0000000
--- a/x/xinitrc.d/notebook.xinitrc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-xrandr --output eDP1 --primary