1 files changed, 25 insertions, 24 deletions

diff --git a/bragi.nix b/bragi.nix
index ba615e97..660cfb06 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -10,6 +10,7 @@ in rec {
       ./users.nix
       ./custom/unit-status-mail.nix
       ./custom/trivmix-service.nix
+      ./custom/mpd.nix
       ./utils/nix/module.nix
     ];
 
@@ -84,27 +85,29 @@ in rec {
   };
 
   nixpkgs.config = {
-    packageOverrides = oldPkgs: with oldPkgs; {
-      haskellPackages = haskellPackages.override {
-        overrides = self: super: with self; {
-          encoding = haskell.lib.overrideCabal encoding ( oldAttrs: {
-            src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
-          });
-          inherit
-            (lib.mapAttrs (name: haskell.lib.dontCheck) super)
-            Glob filelock hedgehog;
-          inherit
-            (callPackage ./custom/thermoprint { inherit runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
-            thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
+    overlays = [
+      (selfPkgs: superPkgs: with superPkgs; {
+        haskellPackages = haskellPackages.override {
+          overrides = self: super: with self; {
+            encoding = haskell.lib.overrideCabal encoding ( oldAttrs: {
+              src = fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
+            });
+            inherit
+              (lib.mapAttrs (name: haskell.lib.dontCheck) super)
+              Glob filelock hedgehog;
+            inherit
+              (callPackage ./custom/thermoprint { inherit runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); })
+              thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
+          };
         };
-      };
 
-      jack2Full = jack2Full.override { dbus = null; };
+        jack2Full = jack2Full.override { dbus = null; };
 
-      mpd = mpd.override { gmeSupport = false; pulseaudioSupport = false; };
+        mpd = mpd.override { gmeSupport = false; pulseaudioSupport = false; };
       
-      inherit (pkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint;
-    };
+        inherit (pkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint;
+      })
+    ];
 
     allowUnfree = true;
   };
@@ -225,14 +228,12 @@ in rec {
   services.mpd = {
     enable = true;
     musicDirectory = "smb://odin.asgard.yggdrasil/media/music";
-    network.listenAddress = "any"; # Just so the module won't produce a bind_to_adress line
+    listenAddresses = [
+      { address = "any"; }
+      "/var/lib/mpd/socket"
+    ];
+    startWhenNeeded = true;
     extraConfig = ''
-      bind_to_address "bragi.bragisheimr.yggdrasil"
-      bind_to_address "bragi.asgard.yggdrasil"
-      bind_to_address "localhost"
-
-      bind_to_address "/var/lib/mpd/socket"
-    
       audio_output {
         name "JACK"
         type "jack"