diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2021-01-17 11:57:14 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2021-01-17 11:57:14 +1300 |
commit | 9e4cb59908a69f4852b9cdd2a6d26cb1bba36289 (patch) | |
tree | ae1bfede21830ffa913e9a0da3f7c70f7e4f7c2e | |
parent | Merge branch 'release/v10.23.0' (diff) | |
parent | Update dotfiles(7) manual page (diff) | |
download | dotfiles-9e4cb59908a69f4852b9cdd2a6d26cb1bba36289.tar.gz dotfiles-9e4cb59908a69f4852b9cdd2a6d26cb1bba36289.zip |
Merge branch 'release/v10.24.0'
* release/v10.24.0:
Update dotfiles(7) manual page
Remove MPD and ncmpcpp config
-rw-r--r-- | ISSUES.md | 4 | ||||
-rw-r--r-- | Makefile | 11 | ||||
-rw-r--r-- | README.md | 1 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | man/man7/dotfiles.7df | 2 | ||||
-rw-r--r-- | mpd/mpdconf | 15 | ||||
-rw-r--r-- | mpd/profile.d/mpd.sh | 3 | ||||
-rw-r--r-- | ncmpcpp/config | 8 |
8 files changed, 4 insertions, 44 deletions
@@ -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 @@ -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 @@ -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 @@ -1,2 +1,2 @@ -tejr dotfiles v10.23.0 -Fri, 15 Jan 2021 01:32:33 +0000 +tejr dotfiles v10.24.0 +Sat, 16 Jan 2021 22:57:10 +0000 diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index 899cacb1..c230806e 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -143,8 +143,6 @@ Mutt (http://www.mutt.org/)\[em]Terminal mail user agent \f[C]mysql(1)\f[] (https://linux.die.net/man/1/mysql)\[em]Command\-line MySQL client .IP \[bu] 2 -Ncmpcpp (https://rybczak.net/ncmpcpp/)\[em]ncurses music player client -.IP \[bu] 2 Newsboat (https://newsboat.org/)\[em]Terminal RSS/Atom feed reader .IP \[bu] 2 \f[C]psql(1)\f[] (https://linux.die.net/man/1/psql)\[em]Command\-line 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" |