From 4f0059a6aa85483fd8ccdef840891c0501bfcfc2 Mon Sep 17 00:00:00 2001 From: Mark Date: Sat, 8 Oct 2022 10:11:20 -0700 Subject: [PATCH] Cleaned up configs --- .editorconfig | 12 ++ .gitignore | 14 +- fish/.editorconfig | 7 + fish/config.fish | 5 +- mpd/.editorconfig | 7 + mpd/README.md | 3 - mpd/mpd.conf | 324 ++++-------------------------------------- ncmpcpp/.editorconfig | 9 ++ ncmpcpp/README.md | 3 - ncmpcpp/config | 2 +- 10 files changed, 80 insertions(+), 306 deletions(-) create mode 100644 .editorconfig create mode 100644 fish/.editorconfig create mode 100644 mpd/.editorconfig delete mode 100644 mpd/README.md create mode 100644 ncmpcpp/.editorconfig delete mode 100644 ncmpcpp/README.md diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..a1027e5 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false \ No newline at end of file diff --git a/.gitignore b/.gitignore index ca8238e..83b5edf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,13 @@ -fish/fish_variables \ No newline at end of file +fish/fish_variables +fish/completions +fish/functions +fish/conf.d + +mpd/playlists +mpd/database +mpd/log +mpd/pid +mpd/state +mpd/sticker.sql + +ncmpcpp/bindings diff --git a/fish/.editorconfig b/fish/.editorconfig new file mode 100644 index 0000000..75e3ebf --- /dev/null +++ b/fish/.editorconfig @@ -0,0 +1,7 @@ +[*] +indent_style = tab +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false \ No newline at end of file diff --git a/fish/config.fish b/fish/config.fish index d49d2d8..88722f7 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,6 +1,9 @@ #!/usr/bin/fish +set fish_greeting +set --export GOPATH "/home/mark/Documents/go" + # Git aliases alias glog "git log --oneline --all --graph" @@ -57,4 +60,4 @@ end # Enable kitty command completion -kitty + complete setup fish | source \ No newline at end of file +kitty + complete setup fish | source diff --git a/mpd/.editorconfig b/mpd/.editorconfig new file mode 100644 index 0000000..8d6ee34 --- /dev/null +++ b/mpd/.editorconfig @@ -0,0 +1,7 @@ +[*] +indent_style = tab +indent_size = 8 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false \ No newline at end of file diff --git a/mpd/README.md b/mpd/README.md deleted file mode 100644 index ce8c713..0000000 --- a/mpd/README.md +++ /dev/null @@ -1,3 +0,0 @@ -**MPD config** - -These files go in `~/.mpd` diff --git a/mpd/mpd.conf b/mpd/mpd.conf index 1aef5d8..ec4e4d1 100644 --- a/mpd/mpd.conf +++ b/mpd/mpd.conf @@ -2,215 +2,42 @@ # Read the user manual for documentation: http://www.musicpd.org/doc/user/ # Don't play music on start -restore_paused "yes" -# 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 "~/Music" - -# 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 "~/.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. -# +# Files +music_directory "~/Desktop/sync/Music" +playlist_directory "~/.mpd/playlists" db_file "~/.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. -# -log_file "~/.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 "~/.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 "~/.mpd/state" -# -# The location of the sticker database. This is a database which -# manages dynamic information attached to songs. -# -sticker_file "~/.mpd/sticker.sql" -# -############################################################################### +log_file "~/.mpd/log" +pid_file "~/.mpd/pid" +state_file "~/.mpd/state" +sticker_file "~/.mpd/sticker.sql" + +auto_update "yes" +follow_outside_symlinks "yes" +follow_inside_symlinks "yes" +save_absolute_paths_in_playlists "no" -# 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 "mark" -# -# 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. Not effective if -# systemd socket activiation is in use. -# -# 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" -# -# Setting "restore_paused" to "yes" puts MPD into pause mode instead -# of starting playback after startup. -# -#restore_paused "no" -# -# 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 user manual. +# Runtime options +user "mark" +group "mark" +port "6600" + +restore_paused "yes" +volume_normalization "no" + metadata_to_use "artist,album,title,track,name,genre,date,comment" -# -# This example just enables the "comment" tag without disabling all -# the other supported tags: -#metadata_to_use "+comment" -# -# 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" -# -############################################################################### +zeroconf_enabled "no" -# 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" -# -############################################################################### +# Output options - -# 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. %h will be replaced with the hostname. -# -#zeroconf_name "Music Player @ %h" -# -############################################################################### - - -# Permissions ################################################################# -# -# If this setting is set, MPD will require password authorization. The password -# 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 ####################################################################### -# - -#music_directory " -#database { -# plugin "proxy" -# host "172.16.11.17" -# 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. - -# Pulse output audio_output { type "pulse" name "pulse audio" } -# FIFO output for visualization +# fifo for visualizer audio_output { type "fifo" name "fifo" @@ -219,7 +46,7 @@ audio_output { } -# Disable a few plugins to silence logins +# Plugins input { plugin "tidal" enabled "no" @@ -229,107 +56,10 @@ input { enabled "no" } decoder { - plugin "hybrid_dsd" - enabled "no" + plugin "hybrid_dsd" + enabled "no" } - - -# A 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 a httpd output (built-in HTTP streaming server): -# -#audio_output { -# type "httpd" -# name "My HTTP Stream" -# encoder "vorbis" # optional, vorbis or lame -# port "8000" -# bind_to_address "0.0.0.0" # 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 "My Pulse Output" -## server "remote_server" # optional -## sink "remote_server_sink" # optional -#} -# - -## An example of a null output (for no audio output): -# -#audio_output { -# type "null" -# name "My Null Output" -# mixer_type "none" # optional -#} - decoder { plugin "wildmidi" enabled "no" -} - -# -############################################################################### - - -# 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 "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 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" -# -############################################################################### - -# 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" -# -############################################################################### +} \ No newline at end of file diff --git a/ncmpcpp/.editorconfig b/ncmpcpp/.editorconfig new file mode 100644 index 0000000..cf0903d --- /dev/null +++ b/ncmpcpp/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_style = tab +indent_size = 8 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false \ No newline at end of file diff --git a/ncmpcpp/README.md b/ncmpcpp/README.md deleted file mode 100644 index 0c42c25..0000000 --- a/ncmpcpp/README.md +++ /dev/null @@ -1,3 +0,0 @@ -**NCMPCPP config** - -These files go in `~/.ncmpcpp` diff --git a/ncmpcpp/config b/ncmpcpp/config index 2cb4486..0a93277 100644 --- a/ncmpcpp/config +++ b/ncmpcpp/config @@ -4,7 +4,7 @@ # |_| |_|_| |___/ |___/\___|_| \_/\___|_| # -mpd_host =localhost +mpd_host = localhost mpd_port = 6600 mpd_connection_timeout = 5