aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2021-01-17 11:56:33 +1300
committerTom Ryder <tom@sanctum.geek.nz>2021-01-17 11:56:33 +1300
commit75c9a75fa9144d79b4e9a5d7a0bc647812774b8c (patch)
tree89f89c8785f09efd0fe6c1c11d54074f3d72f3a2
parentMerge branch 'release/v10.23.0' into develop (diff)
downloaddotfiles-75c9a75fa9144d79b4e9a5d7a0bc647812774b8c.tar.gz
dotfiles-75c9a75fa9144d79b4e9a5d7a0bc647812774b8c.zip
Remove MPD and ncmpcpp config
They're too short, and very host-specific.
-rw-r--r--ISSUES.md4
-rw-r--r--Makefile11
-rw-r--r--README.md1
-rw-r--r--mpd/mpdconf15
-rw-r--r--mpd/profile.d/mpd.sh3
-rw-r--r--ncmpcpp/config8
6 files changed, 2 insertions, 40 deletions
diff --git a/ISSUES.md b/ISSUES.md
index 0fd27a77..c9d395ab 100644
--- a/ISSUES.md
+++ b/ISSUES.md
@@ -19,8 +19,8 @@ Known issues
educated guesses (`id -u`@`cat /etc/mailname`) etc rather than hardcoding my
own stuff in there
- Need to decide whether I care about XDG, and implement it if I do
-- Need to decide whether I'm testing the shell snippets for MPD, Keychain etc,
- and if so how.
+- Need to decide whether I'm testing the shell snippets for Keychain etc, and
+ if so how.
- The custom shell functions really should be documented, but it's not clear to
me exactly where this should happen, because the commands' availability
depends on which shell you're using; the `sd` function isn't available when
diff --git a/Makefile b/Makefile
index a7bae4e6..96c706cf 100644
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,9 @@
install-login-shell \
install-mail \
install-man \
- install-mpd \
install-mpv \
install-mutt \
install-mysql \
- install-ncmcpp \
install-newsboat \
install-perlcritic \
install-perltidy \
@@ -469,11 +467,6 @@ install-man:
mkdir -p -- $(XDG_DATA_HOME)/man/man7
cp -p -- man/man7/dotfiles.7df $(XDG_DATA_HOME)/man/man7
-install-mpd: install-sh
- mkdir -p -- $(HOME)/.mpd/playlists
- cp -p -- mpd/profile.d/*.sh $(HOME)/.profile.d
- cp -p -- mpd/mpdconf $(HOME)/.mpdconf
-
install-mpv:
mkdir -p -- $(XDG_CONFIG_HOME)/mpv
cp -p -- mpv/* $(XDG_CONFIG_HOME)/mpv
@@ -494,10 +487,6 @@ install-mutt: install-gnupg install-mail mutt/filters/markdown-to-html
cp -p -- mutt/filters/markdown-to-html \
$(HOME)/.local/libexec/mutt/filters
-install-ncmcpp: install-mpd
- mkdir -p -- $(HOME)/.ncmpcpp
- cp -p -- ncmpcpp/config $(HOME)/.ncmpcpp
-
install-newsboat: install-systemd
mkdir -p -- $(XDG_CONFIG_HOME)/newsboat $(XDG_DATA_HOME)/newsboat
cp -p -- newsboat/config $(XDG_CONFIG_HOME)/newsboat
diff --git a/README.md b/README.md
index 6b8a08f7..e1379d19 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,6 @@ Configuration is included for:
- [mpv](https://mpv.io/)---Media player
- [Mutt](http://www.mutt.org/)---Terminal mail user agent
- [`mysql(1)`](https://linux.die.net/man/1/mysql)---Command-line MySQL client
-- [Ncmpcpp](https://rybczak.net/ncmpcpp/)---ncurses music player client
- [Newsboat](https://newsboat.org/)---Terminal RSS/Atom feed reader
- [`psql(1)`](https://linux.die.net/man/1/psql)---Command-line PostgreSQL
client
diff --git a/mpd/mpdconf b/mpd/mpdconf
deleted file mode 100644
index 8dd88810..00000000
--- a/mpd/mpdconf
+++ /dev/null
@@ -1,15 +0,0 @@
-bind_to_address "~/.mpd/socket"
-
-db_file "~/.mpd/database"
-log_file "~/.mpd/log"
-
-music_directory "/mnt/media/shares/music"
-playlist_directory "~/.mpd/playlists"
-pid_file "~/.mpd/pid"
-state_file "~/.mpd/state"
-sticker_file "~/.mpd/sticker.sql"
-
-audio_output {
- type "pulse"
- name "PulseAudio"
-}
diff --git a/mpd/profile.d/mpd.sh b/mpd/profile.d/mpd.sh
deleted file mode 100644
index 5a14aef2..00000000
--- a/mpd/profile.d/mpd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Start an mpd process if one isn't already running
-command -v mpd >/dev/null 2>&1 || return
-[ -s "$HOME"/.mpd/pid ] || mpd
diff --git a/ncmpcpp/config b/ncmpcpp/config
deleted file mode 100644
index 7e865a8f..00000000
--- a/ncmpcpp/config
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration directory
-ncmpcpp_directory = "~/.ncmpcpp"
-
-# Server specifics
-mpd_host = "~/.mpd/socket"
-
-# No mouse, it confuses tmux/urxvt, and I never use it anyway
-mouse_support = "no"