From 7a2c06b3ebbc39fd8829a8e28c4640c9bf102667 Mon Sep 17 00:00:00 2001
From: Mike Vink <mike1994vink@gmail.com>
Date: Tue, 17 Oct 2023 23:08:41 +0200
Subject: add music

---
 machines/lemptop.nix            |  2 +-
 mut/bin/sb-music                | 19 +++++++++++++++++++
 mut/dwmblocks                   |  2 +-
 overlays/suckless.nix           |  2 +-
 profiles/core/configuration.nix |  1 +
 profiles/station/music.nix      |  1 +
 6 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100755 mut/bin/sb-music

diff --git a/machines/lemptop.nix b/machines/lemptop.nix
index 1d56804..d786de2 100644
--- a/machines/lemptop.nix
+++ b/machines/lemptop.nix
@@ -50,7 +50,7 @@
   services.blueman.enable = true;
   hardware.keyboard.qmk.enable = true;
   hardware.system76.enableAll = true;
-  services.xserver.videoDrivers = [ "intel" ];
+  services.xserver.videoDrivers = [ "i915" ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/mut/bin/sb-music b/mut/bin/sb-music
new file mode 100755
index 0000000..d164b4b
--- /dev/null
+++ b/mut/bin/sb-music
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+filter() { sed "/^volume:/d;s/\\&/&amp;/g;s/\\[paused\\].*/⏸/g;/\\[playing\\].*/d;/^ERROR/Q" | paste -sd ' ' -;}
+
+pidof -x sb-mpdup >/dev/null 2>&1 || sb-mpdup >/dev/null 2>&1 &
+
+case $BLOCK_BUTTON in
+	1) mpc status | filter ; setsid -f "$TERMINAL" -e ncmpcpp ;;  # right click, pause/unpause
+	2) mpc toggle | filter ;;  # right click, pause/unpause
+	3) mpc status | filter ; notify-send "🎵 Music module" "\- Shows mpd song playing.
+- ⏸ when paused.
+- Left click opens ncmpcpp.
+- Middle click pauses.
+- Scroll changes track.";;  # right click, pause/unpause
+	4) mpc prev   | filter ;;  # scroll up, previous
+	5) mpc next   | filter ;;  # scroll down, next
+	6) mpc status | filter ; "$TERMINAL" -e "$EDITOR" "$0" ;;
+	*) mpc status | filter ;;
+esac
diff --git a/mut/dwmblocks b/mut/dwmblocks
index 36675e3..f8aaf48 160000
--- a/mut/dwmblocks
+++ b/mut/dwmblocks
@@ -1 +1 @@
-Subproject commit 36675e3bbb519a0741477d4e969bb521e5c8bfce
+Subproject commit f8aaf481e40c8ce60f4fe795368b9bca59fb09b1
diff --git a/overlays/suckless.nix b/overlays/suckless.nix
index 959cab6..a607a45 100644
--- a/overlays/suckless.nix
+++ b/overlays/suckless.nix
@@ -10,7 +10,7 @@
     }));
     dwmblocks =(prev.stdenv.mkDerivation rec {
       pname = "dwmblocks";
-      version = "1.1.2";
+      version = "1.1.3";
       src = /. + home + "/flake/mut/dwmblocks";
       buildInputs = [prev.xorg.libX11];
       installPhase = ''
diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index a427677..6829d01 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -36,6 +36,7 @@
     pinentry-curses
     gnused
     htop
+    pciutils
     dnsutils
     iputils
     inetutils
diff --git a/profiles/station/music.nix b/profiles/station/music.nix
index 36ff02e..80e0a51 100644
--- a/profiles/station/music.nix
+++ b/profiles/station/music.nix
@@ -1,5 +1,6 @@
 { config, pkgs, lib, ... }: {
     secrets.mopidy.owner = lib.ivi.username;
+    hm.home.packages = [pkgs.mpc-cli];
     hm.services.mopidy = {
         enable = true;
         extensionPackages = with pkgs; [mopidy-spotify mopidy-mpd];
-- 
cgit v1.2.3