diff --git a/dotfiles.org b/dotfiles.org index b6969ea..048f8a5 100644 --- a/dotfiles.org +++ b/dotfiles.org @@ -131,7 +131,53 @@ return config allow-emacs-pinentry #+end_src -* Bluetooth +* Audio +** mpd +#+begin_src ini :tangle ~/.config/mpd/mpd.conf +db_file "~/.config/mpd/database" +log_file "~/.config/mpd/log" +music_directory "/mnt/media/music" +playlist_directory "~/.config/mpd/playlists" +pid_file "~/.config/mpd/pid" +state_file "~/.config/mpd/state" +sticker_file "~/.config/mpd/sticker.sql" + +auto_update "yes" + +bind_to_address "127.0.0.1" +restore_paused "yes" +max_output_buffer_size "16384" + +audio_output { + type "alsa" + name "alsa for audio soundcard" + # mixer_type "software" +} + +audio_output { +type "fifo" +name "toggle_visualizer" +path "/tmp/mpd.fifo" +format "44100:16:2" +} + +audio_output { + type "pulse" + name "PulseAudio Output" + #server "localhost" # optional + #sink "alsa_output" # optional +} + +audio_output { + type "alsa" + name "MPD" + device "pulse" + mixer_control "Master" +} +#+end_src + +** Bluetooth +- TODO: evaluate if this can be done differently in nixos #+begin_src lua :tangle /sudo::/etc/wireplumber/bluetooth.lua.d/51-bluez-config.lua bluez_monitor.properties = { ["bluez5.enable-sbc-xq"] = true, @@ -246,7 +292,6 @@ EndSection #+end_src * Special Exceptions - ** Tdrop - Must be installed from the repo, doesn't work from nix repos - Must be moved to /usr/local/bin and given same permissions that come from make install diff --git a/slackware/home/mpd/.config/mpd/mpd.conf b/slackware/home/mpd/.config/mpd/mpd.conf deleted file mode 100644 index b22f35a..0000000 --- a/slackware/home/mpd/.config/mpd/mpd.conf +++ /dev/null @@ -1,40 +0,0 @@ -db_file "~/.config/mpd/database" -log_file "~/.config/mpd/log" -music_directory "/mnt/media/music" -playlist_directory "~/.config/mpd/playlists" -pid_file "~/.config/mpd/pid" -state_file "~/.config/mpd/state" -sticker_file "~/.config/mpd/sticker.sql" - -auto_update "yes" - -bind_to_address "127.0.0.1" -restore_paused "yes" -max_output_buffer_size "16384" - -audio_output { - type "alsa" - name "alsa for audio soundcard" - # mixer_type "software" -} - -audio_output { -type "fifo" -name "toggle_visualizer" -path "/tmp/mpd.fifo" -format "44100:16:2" -} - -audio_output { - type "pulse" - name "PulseAudio Output" - #server "localhost" # optional - #sink "alsa_output" # optional -} - -audio_output { - type "alsa" - name "MPD" - device "pulse" - mixer_control "Master" -}