From 86bf5b1fd1a1f173d6edf89dfc7fe7cc9c6a9fe8 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 11 Mar 2014 17:20:55 +0100 Subject: [PATCH] add mpd(scribble)? and mutt changes to pin posts with \CP --- README.md | 1 + install | 1 + mpd.conf | 421 +++++++++++++++++++++++++++++++++++++++++++++++ mpdscribble.conf | 54 ++++++ muttrc | 6 +- 5 files changed, 480 insertions(+), 3 deletions(-) create mode 100644 mpd.conf create mode 100644 mpdscribble.conf diff --git a/README.md b/README.md index 58d8875..d7affc6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Also includes a script to install it:) notes: * For msmtp I've patched my msmtp to have the --password flag included using the patch found at https://aur.archlinux.org/packages/msmtp-pwpatched/ * In bashrc there are two functions concerning encrypted cloud storage, for more info: http://martlubbers.net/nsa-dropbox.html +* for mpdscribble.conf you still need to add the password, md5 is not working... TODO: * screen, irssi diff --git a/install b/install index 6d4d4bc..bc53935 100755 --- a/install +++ b/install @@ -5,6 +5,7 @@ cp -if `pwd`/.bashrc ~/.bashrc || true cp -if `pwd`/muttrc ~/.mutt/muttrc || true cp -if `pwd`/msmtp ~/.mutt/msmtp || true cp -if `pwd`/offlineimaprc ~/.mutt/offlineimaprc || true +sudo cp -if `pwd`/mpd.conf /etc/mpd.conf || true if [ "$1" = "-x" ] then diff --git a/mpd.conf b/mpd.conf new file mode 100644 index 0000000..9a2899a --- /dev/null +++ b/mpd.conf @@ -0,0 +1,421 @@ +# 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 "/mnt/data/beets" +# +# 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 "/var/lib/mpd/playlists" +# +# 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/tag_cache" +# +# 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/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 "/var/lib/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 "mpd" +# +# 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. Choose any if you want +# to have mpd listen on every address +# +# For network +bind_to_address "0.0.0.0" +# +# And for Unix Socket +#bind_to_address "/var/run/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 as vbrfix in the debian archive), at which +# point gapless MP3 playback can be enabled. +# +#gapless_mp3_playback "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. Optionally, 'comment' can be added to this +# list. +# +#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" +# +############################################################################### + + +# 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. +# +# See for examples of +# other audio outputs. +# +# An example of an ALSA output: +# +#audio_output { +# type "alsa" +# name "My ALSA Device" +# device "hw:0,0" # optional +# format "44100:16:2" # optional +# mixer_device "default" # optional +# mixer_control "Master" # optional +# mixer_index "0" # optional +#} +# +# An example of an OSS output: +# +#audio_output { +# type "oss" +# name "My OSS Device" +# device "/dev/dsp" # optional +# format "44100:16:2" # 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 +# genre "jazz" # optional +# public "no" # optional +# timeout "2" # 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 "My HTTP Stream" + encoder "flac" + port "8123" + format "44100:16:2" +} +# +# An example of a pulseaudio output (streaming to a remote pulseaudio server) +# +#audio_output { +# type "pulse" +# name "My Pulse Output" +# server "remote_server" # optional +# sink "remote_server_sink" # 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" +#} +# +# This setting will change all decoded audio to be converted to the specified +# format before being passed to the audio outputs. By default, this setting is +# disabled. +# +#audio_output_format "44100:16:2" +# +# 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" +# +############################################################################### + + +# Volume control mixer ######################################################## +# +# These are the global volume control settings. By default, this setting will +# be detected to the available audio output device, with preference going to +# hardware mixing. Hardware and software mixers for individual audio_output +# sections cannot yet be mixed. +# +# An example for controlling an ALSA, OSS or Pulseaudio mixer; If this +# setting is used other sound applications will be affected by the volume +# being controlled by MPD. +# +#mixer_type "hardware" +# +# An example for controlling all mixers through software. This will control +# all controls, even if the mixer is not supported by the device and will not +# affect any other sound producing applications. +# +#mixer_type "software" +# +# This example will not allow MPD to touch the mixer at all and will disable +# all volume controls. +# +#mixer_type "disabled" +# +############################################################################### + + +# Normalization automatic volume adjustments ################################## +# +# This setting specifies the type of ReplayGain to use. This setting can have +# the argument "album" or "track". See for more +# details. This setting is disabled by default. +# +#replaygain "album" +# +# This setting sets the pre-amp used for files that have ReplayGain tags. By +# default this setting is disabled. +# +#replaygain_preamp "0" +# +# 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 "2048" +# +# 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 "8192" +# +############################################################################### + + +# Character Encoding ########################################################## +# +# If file or directory names do not display correctly for your locale then you +# may need to modify this setting. After modification of this setting mpd +# --create-db must be run to change the database. +# +filesystem_charset "UTF-8" +# +# This setting controls the encoding that ID3v1 tags should be converted from. +# +id3v1_encoding "UTF-8" +# +############################################################################### +# 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/mpdscribble.conf b/mpdscribble.conf new file mode 100644 index 0000000..319dae1 --- /dev/null +++ b/mpdscribble.conf @@ -0,0 +1,54 @@ +## mpdscribble - an audioscrobbler for the Music Player Daemon. +## http://mpd.wikia.com/wiki/Client:mpdscribble + +# HTTP proxy URL. +#proxy = http://the.proxy.server:3128 + +# The location of the pid file. mpdscribble saves its process id there. +#pidfile = /var/run/mpdscribble.pid + +# Change to this system user after daemonization. +#daemon_user = mpdscribble + +# The location of the mpdscribble log file. The special value +# "syslog" makes mpdscribble use the local syslog daemon. On most +# systems, log messages will appear in /var/log/daemon.log then. +# "-" means log to stderr (the current terminal). +log = syslog + +# How verbose mpdscribble's logging should be. Default is 1. +verbose = 1 + +# How often should mpdscribble save the journal file? [seconds] +#journal_interval = 600 + +# The host running MPD, possibly protected by a password +# ([PASSWORD@]HOSTNAME). Defaults to $MPD_HOST or localhost. +#host = localhost + +# The port that the MPD listens on and mpdscribble should try to +# connect to. Defaults to $MPD_PORT or 6600. +#port = 6600 + +[last.fm] +url = http://post.audioscrobbler.com/ +username = thedopefishh +password = PASSWORDHERE +# The file where mpdscribble should store its Last.fm journal in case +# you do not have a connection to the Last.fm server. +journal = /var/cache/mpdscribble/lastfm.journal + +#[libre.fm] +#url = http://turtle.libre.fm/ +#username = my_username +#password = my_password +#journal = /var/cache/mpdscribble/librefm.journal + +#[jamendo] +#url = http://postaudioscrobbler.jamendo.com/ +#username = my_username +#password = my_password +#journal = /var/cache/mpdscribble/jamendo.journal + +#[file] +#file = /var/log/mpdscribble/log diff --git a/muttrc b/muttrc index 76c7c4d..2a0efbc 100644 --- a/muttrc +++ b/muttrc @@ -9,7 +9,7 @@ set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc" # Macros # Force offlineimap to refresh in the background -macro index,pager \CR "offlineimap -c ~/.mutt/offlineimaprc -k Repository_Remote:password=$my_msmtp_pass &" "Force refresh" +macro index,pager $ "offlineimap -c ~/.mutt/offlineimaprc -k Repository_Remote:remotepass=$my_msmtp_pass" "Force refresh" # Move all the mailing lists to the appropriate folder macro index,pager \CT "\ ~C vim@vim.org | ~C vim_use=vim\ @@ -27,8 +27,8 @@ set postponed="+Drafts/" # Drafts set mask="!^\\.[^.]" set certificate_file=~/.mutt/certs set imap_check_subscribed=yes -set sleep_time=0 -set mail_check=5 +#set sleep_time=0 +#set mail_check=5 source ~/.mutt/mailboxes # Generated by offlineimap #View -- 2.20.1