From 7ca435f80be5da09a15363494ece44ac193da2a7 Mon Sep 17 00:00:00 2001
From: ChaotiCryptidz <chaoticryptidz@owo.monster>
Date: Tue, 8 Feb 2022 12:17:15 +0000
Subject: [PATCH] move deploy-rs and musicutil to overlays :3

---
 flake.lock                 | 18 +++++++++---------
 home/apps/musicutil.nix    |  2 +-
 home/dev/all/deploy-rs.nix |  2 +-
 profiles/base/nix.nix      |  6 +++++-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 27ae6ad..361bd0c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1643933104,
-        "narHash": "sha256-NZPuFxRsZKN8pjRuHPpzlMyt6JQhcjiduBG8bMghSjE=",
+        "lastModified": 1644255659,
+        "narHash": "sha256-VuPFOttrBRTOJqPY5yboxVdk1xZjSSlOSDDbBCMKioo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "63dccc4e60422c1db2c3929b2fd1541f36b7e664",
+        "rev": "1ca6293c8fb1dbe13c48fe518440c288256cd562",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1644319517,
-        "narHash": "sha256-qH9+WBMb9zfeJcx2sf7juW28V5ggyv9jX9VKvRApyXg=",
+        "lastModified": 1644320655,
+        "narHash": "sha256-Xi/I1Ms/eyup4ch1rxT9s+gurDLMCnk6HeKgeTKJOnE=",
         "owner": "ChaotiCryptidz",
         "repo": "musicutil",
-        "rev": "7b34eaeb8d05e8e8365127bc1e3389fc2d39663f",
+        "rev": "676e66dde66505d4410675e60fa274b672254d55",
         "type": "gitlab"
       },
       "original": {
@@ -98,11 +98,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1643805626,
-        "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=",
+        "lastModified": 1644193945,
+        "narHash": "sha256-FqPyne57rnbvFfgL5OacS1w85/2NAZo59jqhhhcobek=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb",
+        "rev": "fbd030fb2d8dc9fedcb45e57cbce5e9e064bfb6c",
         "type": "github"
       },
       "original": {
diff --git a/home/apps/musicutil.nix b/home/apps/musicutil.nix
index 59873f7..835e1c5 100644
--- a/home/apps/musicutil.nix
+++ b/home/apps/musicutil.nix
@@ -1 +1 @@
-{ inputs, pkgs, ... }: { home.packages = [ inputs.musicutil.defaultPackage.${pkgs.system} ]; }
+{ inputs, pkgs, ... }: { home.packages = with pkgs; [ musicutil ]; }
diff --git a/home/dev/all/deploy-rs.nix b/home/dev/all/deploy-rs.nix
index b7866fe..525db2c 100644
--- a/home/dev/all/deploy-rs.nix
+++ b/home/dev/all/deploy-rs.nix
@@ -1,3 +1,3 @@
 { pkgs, inputs, ... }: {
-  home.packages = with pkgs; [ inputs.deploy-rs.defaultPackage.${pkgs.system} ];
+  home.packages = with pkgs; [ deploy-rs ];
 }
diff --git a/profiles/base/nix.nix b/profiles/base/nix.nix
index 47080ed..44e5e7b 100644
--- a/profiles/base/nix.nix
+++ b/profiles/base/nix.nix
@@ -9,6 +9,10 @@
   };
   nixpkgs = {
     config = { allowUnfree = true; };
-    overlays = [ (import ../../overlay) ];
+    overlays = [
+      (import ../../overlay)
+      inputs.musicutil.overlay
+      inputs.deploy-rs.overlay
+    ];
   };
 }