From 124a466a7664e21c14e199fec10b62113b9fd085 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Tue, 31 Dec 2024 14:33:59 -0500
Subject: [PATCH] major rewrite of flake including new bitwig package for betas

---
 flake.lock           | 71 +++++---------------------------------------
 flake.nix            |  7 +----
 home/home.nix        | 26 ++++------------
 overlays/default.nix |  3 ++
 4 files changed, 16 insertions(+), 91 deletions(-)

diff --git a/flake.lock b/flake.lock
index 439fe63..dcf45fd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "audio": {
-      "inputs": {
-        "nix-buildproxy": "nix-buildproxy",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735613558,
-        "narHash": "sha256-AellDXIA2KrIAxi3PyvhMnkBiIEjYaLYruB6vuiDrTs=",
-        "ref": "refs/heads/master",
-        "rev": "1600f91c10d6a033d75443be995a57ebe27d0165",
-        "revCount": 76,
-        "type": "git",
-        "url": "https://gt.emenel.ca/emenel/audio.nix.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://gt.emenel.ca/emenel/audio.nix.git"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -155,25 +134,6 @@
         "type": "github"
       }
     },
-    "nix-buildproxy": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1708455753,
-        "narHash": "sha256-qP79WfPiTl92KrZkmvacba9Xas4WwSFln5DjkP2Q/Lg=",
-        "owner": "polygon",
-        "repo": "nix-buildproxy",
-        "rev": "77d486cb4b0458cb4c4a296c3140f7a6c36ab3e6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "polygon",
-        "ref": "v0.1.0",
-        "repo": "nix-buildproxy",
-        "type": "github"
-      }
-    },
     "nix-flatpak": {
       "locked": {
         "lastModified": 1735500379,
@@ -206,16 +166,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708118438,
-        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
-        "owner": "NixOS",
+        "lastModified": 1735531152,
+        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
+        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -236,31 +196,14 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1735531152,
-        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "audio": "audio",
         "home-manager": "home-manager",
         "kmonad": "kmonad",
         "musnix": "musnix",
         "nix-flatpak": "nix-flatpak",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "wezterm": "wezterm"
       }
diff --git a/flake.nix b/flake.nix
index 5703e35..ce35bdb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,11 +25,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    audio = {
-      url = "git+https://gt.emenel.ca/emenel/audio.nix.git";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     wezterm = {
       url = "github:wez/wezterm?dir=nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -42,7 +37,7 @@
     # affinity-nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = {nixpkgs, nixpkgs-unstable, wezterm, home-manager, audio, nix-flatpak, kmonad, musnix, self, ... } @ inputs:
+  outputs = {nixpkgs, nixpkgs-unstable, wezterm, home-manager, nix-flatpak, kmonad, musnix, self, ... } @ inputs:
     let
       inherit (self) outputs;
       # Supported systems for your flake packages, shell, etc.
diff --git a/home/home.nix b/home/home.nix
index 2f23485..3bc99cc 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -8,8 +8,6 @@
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.unstable-packages
-
-      # inputs.audio.overlays.default
     ];
 
     # Configure your nixpkgs instance
@@ -237,29 +235,15 @@
       stirling-pdf
       trash-cli
 
-      (wineWowPackages.stagingFull.override {
-        waylandSupport = true;
-        fontconfigSupport = true;
-        vulkanSupport = true;
-      })
+      wineWowPackages.stagingFull
       # wineWowPackages.fonts
       winetricks
 
-      # bottles
-
-      (pkgs.unstable.yabridge.override {
-        wine = (wineWowPackages.stagingFull.override {
-          waylandSupport = true;
-          fontconfigSupport = true;
-          vulkanSupport = true;
-        });
+      (yabridge.override {
+        wine = wineWowPackages.stagingFull;
       })
-      (pkgs.unstable.yabridgectl.override {
-        wine = (wineWowPackages.stagingFull.override {
-          waylandSupport = true;
-          fontconfigSupport = true;
-          vulkanSupport = true;
-        });
+      (yabridgectl.override {
+        wine = wineWowPackages.stagingFull;
       })
 
       spice
diff --git a/overlays/default.nix b/overlays/default.nix
index fb8a682..8f4cd01 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -18,6 +18,9 @@
 
     wineWowPackages.stagingFull = prev.wineWowPackages.stagingFull.overrideAttrs (old: {
       patches = old.patches ++ [ ./wine-6006.patch ];
+      waylandSupport = true;
+      fontconfigSupport = true;
+      vulkanSupport = true;
     });
   };