From cb36ac2db69dcb4b4fe3c44312ce354dc382de32 Mon Sep 17 00:00:00 2001
From: Hazem Fahmi <hzmmohamed@gmail.com>
Date: Sun, 12 May 2024 02:59:39 +0300
Subject: [PATCH] Music Production updates

---
 flake.lock                                    | 55 +++++++++++++++----
 flake.nix                                     |  3 +
 .../nixos/suites/music-production/default.nix |  7 ++-
 3 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 02e810d..b54947c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -151,7 +151,7 @@
     "cowsay": {
       "inputs": {
         "cowfiles": "cowfiles",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "snowfall-lib": "snowfall-lib_2",
         "vhs": "vhs"
       },
@@ -1912,6 +1912,24 @@
         "type": "github"
       }
     },
+    "musnix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1714858707,
+        "narHash": "sha256-2DJ4F/v3WJsXaFWMmaMc1Rmz4XRv4OVudUhbIhuwJqc=",
+        "owner": "musnix",
+        "repo": "musnix",
+        "rev": "700460ea297ab5172fecc60ec8c9c36d86c5985f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "musnix",
+        "repo": "musnix",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -2171,16 +2189,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1705331948,
-        "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
-        "owner": "nixos",
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -2281,6 +2299,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1714971268,
+        "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1699099776,
         "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
@@ -2296,7 +2330,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1700794826,
         "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
@@ -2630,11 +2664,12 @@
         "flake-checker": "flake-checker",
         "gpg-base-conf": "gpg-base-conf",
         "home-manager": "home-manager",
+        "musnix": "musnix",
         "nix-colors": "nix-colors",
         "nix-ld": "nix-ld",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "plusultra": "plusultra",
         "snowfall-lib": "snowfall-lib_16",
         "sops-nix": "sops-nix",
@@ -3437,7 +3472,7 @@
     },
     "thaw": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "snowfall-lib": "snowfall-lib_15"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 3f3e6e4..b5d1fe5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,6 +96,8 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    musnix  = { url = "github:musnix/musnix"; };
   };
 
   nixConfig = {
@@ -136,6 +138,7 @@
         nix-ld.nixosModules.nix-ld
         vault-service.nixosModules.nixos-vault-service
         sops-nix.nixosModules.sops
+        musnix.nixosModules.musnix
       ];
 
       homes.users."hfahmi@nixos".modules = with inputs; [
diff --git a/modules/nixos/suites/music-production/default.nix b/modules/nixos/suites/music-production/default.nix
index f858808..3cc036c 100644
--- a/modules/nixos/suites/music-production/default.nix
+++ b/modules/nixos/suites/music-production/default.nix
@@ -16,12 +16,14 @@ in {
   };
 
   config = mkIf cfg.enable {
+
+    musnix = enabled;
     caramelmint.cli-apps.wine = enabled;
 
     caramelmint.home.extraOptions = {
       home.packages = with pkgs; [
         audacity
-        ardour
+        unstable.ardour
         unstable.decent-sampler
         carla
         x42-plugins
@@ -31,7 +33,8 @@ in {
         cardinal
         drumgizmo
         sooperlooper
-          #  CHOWTapeModel
+           CHOWTapeModel
+           airwindows-lv2
           #  ChowCentaur
           #  ChowPhaser
           #  easyeffects