From a2f9742062fe31ce3bc974392560b736f34823a7 Mon Sep 17 00:00:00 2001
From: chaos <chaos@owo.monster>
Date: Mon, 30 Oct 2023 14:27:25 +0000
Subject: [PATCH] revert cache, add mpd-headless and owncast to outputs

---
 flake.lock                                    | 32 +++++++++----------
 .../hetzner-arm/containers/music/default.nix  | 25 +--------------
 outputs.nix                                   |  2 +-
 overlay/default.nix                           | 25 +++++++++++++++
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6b6784e..69f8c61 100644
--- a/flake.lock
+++ b/flake.lock
@@ -67,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1698670511,
-        "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=",
+        "lastModified": 1697410455,
+        "narHash": "sha256-jCs/ffIP3tUPN7HWWuae4BB8+haAw2NI02z5BQvWMGM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8e5416b478e465985eec274bc3a018024435c106",
+        "rev": "78125bc681d12364cb65524eaa887354134053d0",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1698222534,
-        "narHash": "sha256-iF9C7C7eT8LVVWx5IOZ/8KKJT8AIw9A5aBA6vqS18l8=",
+        "lastModified": 1697459493,
+        "narHash": "sha256-HH8ePJIVAsiDHIdS4qnKQ9o4X0KTVGA9cfHBplKqpfs=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "a058cff4b09b3a398d8caa379b4dc96cfedd98c9",
+        "rev": "b63b328577f1cb5839f8ecc4fd05040335d4a55a",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1698318101,
-        "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
+        "lastModified": 1697059129,
+        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
+        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1695644571,
-        "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
+        "lastModified": 1697456312,
+        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
+        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
         "type": "github"
       },
       "original": {
@@ -180,11 +180,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1698673581,
-        "narHash": "sha256-lidNMJ2f+f4Zjr9U0iUxDRAcToMHHGGwhchLZRKYA34=",
+        "lastModified": 1697470606,
+        "narHash": "sha256-TP3UN5RktQpqDVj5mA6rb1Nu4vGTnctWkbe5sef4LEw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9a1a107fc246a416e44e2e965a31d79983614541",
+        "rev": "cc83a858d3dbf50a934a4f74fe5508ac2fa72bc5",
         "type": "github"
       },
       "original": {
@@ -312,4 +312,4 @@
   },
   "root": "root",
   "version": 7
-}
+}
\ No newline at end of file
diff --git a/hosts/hetzner-arm/containers/music/default.nix b/hosts/hetzner-arm/containers/music/default.nix
index ef8d9ba..4519ad5 100644
--- a/hosts/hetzner-arm/containers/music/default.nix
+++ b/hosts/hetzner-arm/containers/music/default.nix
@@ -26,30 +26,7 @@
 in {
   nixpkgs.overlays = [
     (final: prev: {
-      mpd =
-        (prev.mpdWithFeatures.override {
-          ffmpeg = final.ffmpeg_6-headless;
-        }) {
-          features = [
-            "audiofile"
-            "flac"
-            "opus"
-            "vorbis"
-            "vorbisenc"
-            "lame"
-            "libsamplerate"
-            "libmpdclient"
-            "id3tag"
-            "expat"
-            "pcre"
-            "yajl"
-            "icu"
-            "sqlite"
-            "systemd"
-            "syslog"
-            "io_uring"
-          ];
-        };
+      mpd = final.mpd-headless;
     })
   ];
 
diff --git a/outputs.nix b/outputs.nix
index 5207613..bb1b52c 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -70,7 +70,7 @@ in
           packages = {
             inherit (pkgs) comic-code comic-sans;
             inherit (pkgs) mk-enc-usb mk-encrypted-drive mk-raspberry-ext-drive;
-            inherit (pkgs) gotosocial;
+            inherit (pkgs) gotosocial mpd-headless owncast;
             inherit (pkgs) piped-backend piped-frontend piped-proxy;
             inherit (pkgs) kitty-terminfo;
           };
diff --git a/overlay/default.nix b/overlay/default.nix
index 223dba5..1924fac 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -13,6 +13,31 @@ final: prev: rec {
     cp -r ${./kitty-terminfo}/* $out/share
   '';
 
+  mpd-headless =
+    (prev.mpdWithFeatures.override {
+      ffmpeg = final.ffmpeg_6-headless;
+    }) {
+      features = [
+        "audiofile"
+        "flac"
+        "opus"
+        "vorbis"
+        "vorbisenc"
+        "lame"
+        "libsamplerate"
+        "libmpdclient"
+        "id3tag"
+        "expat"
+        "pcre"
+        "yajl"
+        "icu"
+        "sqlite"
+        "systemd"
+        "syslog"
+        "io_uring"
+      ];
+    };
+
   owncast = prev.owncast.override {
     ffmpeg = final.ffmpeg_6-headless;
   };