diff --git a/README.md b/README.md index 4888734a..e5562af9 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,6 @@ I know how frustrating it is to see a setup and not have access to the dotfiles. My goal here is simple: use as few config settings as possible required to make everything work, and document the settings that I do use. Your "config" file shouldn't be a `man` page! -- [`cmus/rc`](dotfiles/.config/cmus/rc) - [`fontconfig/fonts.conf`](dotfiles/.config/fontconfig/fonts.conf) - [`feh/keys`](dotfiles/.config/feh/keys) - [`polybar/config`](dotfiles/.config/polybar/config) @@ -61,7 +60,7 @@ chmod +x install.sh ./install.sh ``` -Some of the software I use include (in no particular order): [neovim](https://github.com/neovim/neovim), [ranger](https://github.com/ranger/ranger), [feh](https://github.com/derf/feh), [mpv](https://github.com/mpv-player/mpv), [zathura](https://github.com/pwmt/zathura), [yay](https://github.com/Jguer/yay), [compton](https://github.com/chjj/compton), [polybar](https://github.com/jaagr/polybar), [termite](https://github.com/thestinger/termite), [shotgun](https://github.com/Streetwalrus/shotgun), [waterfox](https://github.com/MrAlex94/Waterfox), [inox](https://github.com/gcarq/inox-patchset), [cmus](https://github.com/cmus/cmus), [i3-gaps](https://github.com/Airblader/i3), and [zsh](https://wiki.archlinux.org/index.php/Zsh). +Some of the software I use include (in no particular order): [neovim](https://github.com/neovim/neovim), [ranger](https://github.com/ranger/ranger), [feh](https://github.com/derf/feh), [mpv](https://github.com/mpv-player/mpv), [zathura](https://github.com/pwmt/zathura), [yay](https://github.com/Jguer/yay), [compton](https://github.com/chjj/compton), [polybar](https://github.com/jaagr/polybar), [termite](https://github.com/thestinger/termite), [shotgun](https://github.com/Streetwalrus/shotgun), [waterfox](https://github.com/MrAlex94/Waterfox), [inox](https://github.com/gcarq/inox-patchset), [mpd](https://github.com/MusicPlayerDaemon/MPD), [mpc](https://github.com/MusicPlayerDaemon/mpc), [ncmpcpp](https://github.com/arybczak/ncmpcpp), [i3-gaps](https://github.com/Airblader/i3), and [zsh](https://wiki.archlinux.org/index.php/Zsh). For a complete list of the packages included, see [`install/packages.sh`](install/packages.sh) and [`install/aur.sh`](install/aur.sh). diff --git a/dotfiles/.config/cmus/rc b/dotfiles/.config/cmus/rc deleted file mode 100644 index 549446a8..00000000 --- a/dotfiles/.config/cmus/rc +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################## -# -# New Start: A modern Arch workflow built with an emphasis on functionality. -# Copyright (C) 2017 Donovan Glover -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -################################################################################## - -# Tell cmus to use alsa (required to get things working) -set output_plugin=alsa -set dsp.alsa.device=default -set mixer.alsa.device=default -set mixer.alsa.channel=Master - -# Bind q to detach cmus instead of closing it (use :q to close cmus) -bind -f common q shell tmux detach-client -s cmus - -# Use the green theme for a clean interface -colorscheme green - -# Load all the songs inside the ~/Music directory -add ~/Music diff --git a/dotfiles/.config/polybar/config b/dotfiles/.config/polybar/config index 64692d1a..e4d1bf4d 100644 --- a/dotfiles/.config/polybar/config +++ b/dotfiles/.config/polybar/config @@ -27,7 +27,7 @@ blue = ${xrdb:color6:#AF80AC} [bar/main] modules-left = i3 -modules-center = cmus +modules-center = mpd modules-right = cpu ram volume date time monitor = VGA-1 @@ -91,11 +91,8 @@ label-full = %percentage%% label-charging = %percentage%% label-discharigng = %percentage% -[module/cmus] -type = custom/script -exec = sh ~/.config/polybar/cmus.sh -exec-if = pgrep -x cmus -interval = 5 +[module/mpd] +type = internal/mpd [module/volume] type = internal/volume diff --git a/dotfiles/.tmux.conf b/dotfiles/.tmux.conf deleted file mode 100644 index c1a9d4b8..00000000 --- a/dotfiles/.tmux.conf +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################## -# -# New Start: A modern Arch workflow built with an emphasis on functionality. -# Copyright (C) 2017 Donovan Glover -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -################################################################################## - -# Turn the status line off; we don't need it. -set-option -g status off diff --git a/dotfiles/.zsh/aliases.zsh b/dotfiles/.zsh/aliases.zsh index bdb57093..44439967 100644 --- a/dotfiles/.zsh/aliases.zsh +++ b/dotfiles/.zsh/aliases.zsh @@ -65,10 +65,6 @@ alias dl="youtube-dl -f bestvideo+bestaudio" alias back="feh --no-fehbg --bg-fill" # Easily set a new background (temporary) alias synctime="ntpdate -u 0.us.pool.ntp.org" # Sync the system time with one on the internet -# Use tmux to open our music player of choice in the background -alias cmas="tmux new-session -A -D -s cmus $(which cmus)" -alias cmus="cmas" # Alias cmus to cmas for good measure - # Show the lines that are in but NOT in alias compare="grep -nFxvf" # Usage: compare diff --git a/help/cmus.md b/help/cmus.md deleted file mode 100644 index 73ba401b..00000000 --- a/help/cmus.md +++ /dev/null @@ -1,28 +0,0 @@ -# cmus - -## Music Playback - -- Play the current song from the beginning: `enter` -- Resume the current song: `x` -- Pause the current song: `c` -- Go to the next song: `b` -- Go to the previous song: `z` -- Toggle shuffle: `s` -- Shuffle between artist, album, or all: `m` - -## Navigating - -- Jump to the current playing song in the cmus view: `i` -- Switch between columns: `tab` -- Basic navigation: `hjkl` -- Search for a particular song: `/` - - Go to the next search result: `n` - - Go to the previous search result: `N` -- View the sorted library: `2` -- View the file browser: `5` -- Add the highlighted song to the queue of songs to play: `e` - -## Volume - -- Increase the volume by 10%: `+` -- Decrease the volume by 10%: `-` diff --git a/install/packages.sh b/install/packages.sh index ff06cb19..171195db 100644 --- a/install/packages.sh +++ b/install/packages.sh @@ -51,7 +51,6 @@ i crystal # Install crystal, a ruby-like language with a binary compiler i nodejs # Install node.js, used as a javascript runtime environment i jq # Install jq, used to manipulate JSON in the terminal -i tmux # Install tmux, used to run terminal programs in the background i fzf # Install fzf, used to easily search for things in vim i pygmentize # Install pygmentize, used as a variant of cat with syntax highlighting i firejail # Install firejail, a simple and straightforward way to sandbox programs @@ -92,8 +91,10 @@ i i3-gaps # Install i3-gaps, our window manager of choice i ranger # Install ranger, our file explorer of choice i feh # Install feh, a quick and simple way to view images -i cmus # Install cmus, our music player of choice i mpv # Install mpv, a no-bloat content-first video player +i mpd # Install mpd, our music player daemon of choice +i mpc # Install mpc, used to control mpd with shell commands +i ncmpcpp # Install ncmpcpp, our music player client of choice i mps-youtube # Install mps-youtube, allowing us to use youtube straight from the terminal i youtube-dl # Install youtube-dl, a straightforward way to download youtube videos