diff --git a/README.md b/README.md index 0bb4b952..564e4435 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,6 @@ You don't have to go through the pain I've experienced again! Check out my | **System resource monitor** | [Btop][Btop] | | **File Manager** | [Yazi][Yazi] + [thunar][thunar] | | **Shell** | [Nushell][Nushell] + [Starship][Starship] | -| **Music Player** | [mpd][mpd], [ncmpcpp][ncmpcpp], [mpc][mpc] | | **Media Player** | [mpv][mpv] | | **Text Editor** | [Neovim][Neovim] | | **Fonts** | [Nerd fonts][Nerd fonts] | @@ -201,10 +200,6 @@ Other dotfiles that inspired me: [Mako]: https://github.com/emersion/mako [Nerd fonts]: https://github.com/ryanoasis/nerd-fonts [catppuccin]: https://github.com/catppuccin/catppuccin -[mpd]: https://github.com/MusicPlayerDaemon/MPD -[ncmpcpp]: https://github.com/ncmpcpp/ncmpcpp -[mpc]: https://github.com/MusicPlayerDaemon/mpc -[Netease-cloud-music-gtk]: https://github.com/gmg137/netease-cloud-music-gtk [NetworkManager]: https://wiki.gnome.org/Projects/NetworkManager [wl-clipboard]: https://github.com/bugaevc/wl-clipboard [GDM]: https://wiki.archlinux.org/title/GDM diff --git a/home/linux/gui/hyprland/conf/mako/config b/home/linux/gui/hyprland/conf/mako/config index b66b00ec..203cf9b3 100644 --- a/home/linux/gui/hyprland/conf/mako/config +++ b/home/linux/gui/hyprland/conf/mako/config @@ -49,8 +49,3 @@ default-timeout=5000 border-color=#f38ba8 text-color=#f38ba8 default-timeout=0 - -[category=mpd] -border-color=#f9e2af -default-timeout=2000 -group-by=category diff --git a/home/linux/gui/hyprland/conf/mpd/mpd.conf b/home/linux/gui/hyprland/conf/mpd/mpd.conf deleted file mode 100644 index 15c359f4..00000000 --- a/home/linux/gui/hyprland/conf/mpd/mpd.conf +++ /dev/null @@ -1,17 +0,0 @@ -# Recommended location for database -db_file "~/.config/mpd/database" - -# If running mpd using systemd, delete this line to log directly to systemd. -log_file "syslog" - -# The music directory is by default the XDG directory, uncomment to amend and choose a different directory -#music_directory "~/Music" - -# Uncomment to refresh the database whenever files in the music_directory are changed -#auto_update "yes" - -# Uncomment to enable the functionalities -#playlist_directory "~/.config/mpd/playlists" -#pid_file "~/.config/mpd/pid" -#state_file "~/.local/state/mpd/state" -#sticker_file "~/.config/mpd/sticker.sql" diff --git a/home/linux/gui/hyprland/conf/scripts/startup b/home/linux/gui/hyprland/conf/scripts/startup index d49a41f7..6719a4be 100755 --- a/home/linux/gui/hyprland/conf/scripts/startup +++ b/home/linux/gui/hyprland/conf/scripts/startup @@ -7,7 +7,7 @@ ln -s $XDG_RUNTIME_DIR/hypr /tmp/hypr ## Autostart Programs # Kill already running process -_ps=(waybar mako mpd) +_ps=(waybar mako) for _prs in "${_ps[@]}"; do if [[ $(pidof ${_prs}) ]]; then killall -9 ${_prs} @@ -23,6 +23,3 @@ done # Launch statusbar (waybar) ~/.config/hypr/scripts/statusbar & - -# Start mpd -exec mpd & diff --git a/home/linux/gui/hyprland/conf/waybar/config.jsonc b/home/linux/gui/hyprland/conf/waybar/config.jsonc index 9ffcae91..e98ed979 100644 --- a/home/linux/gui/hyprland/conf/waybar/config.jsonc +++ b/home/linux/gui/hyprland/conf/waybar/config.jsonc @@ -5,7 +5,6 @@ "modules-left": ["custom/launcher", "temperature", "backlight", "hyprland/workspaces"], "modules-center": ["custom/playerctl"], "modules-right": [ - "mpd", "pulseaudio", "battery", "memory", @@ -76,28 +75,6 @@ "warning": 85, }, }, - "mpd": { - "interval": 2, - "unknown-tag": "N/A", - "format": "{stateIcon} {artist} - {title}", - "format-disconnected": " Disconnected", - "format-paused": "{stateIcon} {artist} - {title}", - "format-stopped": "Stopped ", - "state-icons": { - "paused": "", - "playing": "", - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)", - // Commands to execute on events - "on-click": "mpc toggle", - "on-click-middle": "mpc prev", - "on-click-right": "mpc next", - "on-update": "", - "on-scroll-up": "mpc seek +00:00:01", - "on-scroll-down": "mpc seek -00:00:01", - "smooth-scrolling-threshold": 1, - }, "custom/playerctl": { "format": "{icon} {}", "return-type": "json", diff --git a/home/linux/gui/hyprland/conf/waybar/style.css b/home/linux/gui/hyprland/conf/waybar/style.css index cddb43a9..92187e9f 100644 --- a/home/linux/gui/hyprland/conf/waybar/style.css +++ b/home/linux/gui/hyprland/conf/waybar/style.css @@ -76,7 +76,6 @@ tooltip label { #memory, #temperature, #cpu, -#mpd, #custom-wall, #temperature, #backlight, @@ -150,13 +149,4 @@ tooltip label { padding-right: 8px; padding-left: 10px; } -#mpd.paused { - color: #414868; - font-style: italic; -} -#mpd.stopped { - background: transparent; -} -#mpd { - color: #c0caf5; -} + diff --git a/home/linux/gui/hyprland/values/hyprland.nix b/home/linux/gui/hyprland/values/hyprland.nix index 3d3429e4..fc0af44a 100644 --- a/home/linux/gui/hyprland/values/hyprland.nix +++ b/home/linux/gui/hyprland/values/hyprland.nix @@ -17,8 +17,6 @@ in { "hypr/scripts".source = mkSymlink "${hyprPath}/scripts"; "hypr/waybar".source = mkSymlink "${hyprPath}/waybar"; "hypr/wlogout".source = mkSymlink "${hyprPath}/wlogout"; - # music player - mpd - "mpd".source = mkSymlink "${hyprPath}/mako"; }; # NOTE: diff --git a/home/linux/gui/hyprland/values/packages.nix b/home/linux/gui/hyprland/values/packages.nix index c0f0bad3..c2e80c93 100644 --- a/home/linux/gui/hyprland/values/packages.nix +++ b/home/linux/gui/hyprland/values/packages.nix @@ -23,9 +23,6 @@ # audio alsa-utils # provides amixer/alsamixer/... - mpd # for playing system sounds - mpc-cli # command-line mpd client - ncmpcpp # a mpd client with a UI networkmanagerapplet # provide GUI app: nm-connection-editor ]; }