Move mpd server to workshop only

3 files changed, 29 insertions, 19 deletions

diff --git a/lib/linux.nix b/lib/linux.nix
index 1f22963..14ee8ac 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -186,25 +186,6 @@ in
       postExec = "${pkgs.notmuch}/bin/notmuch new";
     };
 
-    mpd = {
-      enable = true;
-      musicDirectory = "/mnt/campbell/ben/music";
-      network = {
-        listenAddress = "0.0.0.0";
-        port = 6600;
-      };
-      extraConfig = ''
-        audio_output {
-          type "httpd"
-          name "HTTP Stream"
-          encoder "vorbis"
-          port "8097"
-          quality "7.0"
-          format "44100:16:2"
-        }
-      '';
-    };
-
     polybar = {
       # https://github.com/0x746866/dots/blob/master/polybar/config
       enable = true;
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
index b7fe9e2..733deca 100644
--- a/profiles/laptop.nix
+++ b/profiles/laptop.nix
@@ -9,13 +9,16 @@
     ../lib/ssh.nix
     ../lib/packages.nix
   ];
+
   home = {
     packages = [
       pkgs.wmctrl
       pkgs.zulip
     ];
   };
+
   programs.autorandr.enable = true;
+
   programs.autorandr.hooks.postswitch = {
     "restart-polybar" = "systemctl --user restart polybar.service";
   };
diff --git a/profiles/workshop.nix b/profiles/workshop.nix
index 783d75d..311aeab 100644
--- a/profiles/workshop.nix
+++ b/profiles/workshop.nix
@@ -8,6 +8,7 @@
     ../lib/packages.nix
     ../lib/emacs.nix
   ];
+
   home = {
     sessionVariables = {
       GPGID = "C184FB3920E3510D";
@@ -16,9 +17,13 @@
       weechat
     ];
   };
+
   services.polybar.config."bar/top".monitor = lib.mkForce "HDMI-1";
+
   services.random-background.enable = lib.mkForce true;
+
   programs.git.signing.signByDefault = true;
+
   systemd.user.services = {
     "shop-music".Service = {
       RestartSec = "3s";
@@ -26,4 +31,25 @@
       ExecStart = "${pkgs.mplayer}/bin/mplayer http://localhost:8097";
     };
   };
+
+  services.mpd = {
+    enable = true;
+    musicDirectory = "/mnt/campbell/ben/music";
+    network = {
+      listenAddress = "0.0.0.0";
+      port = 6600;
+    };
+    extraConfig = ''
+      audio_output {
+        type "httpd"
+        name "HTTP Stream"
+        encoder "vorbis"
+        port "8097"
+        quality "7.0"
+        format "44100:16:2"
+      }
+    '';
+  };
+
+
 }