From fdcbad90173db9f750b5c13330894b71ad2d0b40 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 5 Jan 2025 15:07:00 -0500 Subject: [PATCH] yab and bitwig --- flake.lock | 30 ++++++++++----------- home/home.nix | 10 +++---- packages/bitwig-beta/bitwig-studio-beta.nix | 2 ++ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 136e36c..de3adf0 100644 --- a/flake.lock +++ b/flake.lock @@ -134,11 +134,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736057491, - "narHash": "sha256-VTKk01nq122E0YuDcTS7tWFBlfOjnZQteHJkPU5F370=", + "lastModified": 1736092609, + "narHash": "sha256-AyQh4Odsb2yVZb0nqoijs0vU3N3bBBEzwGi3pukObOo=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "7a27af8bfce9007e31be10aeafe7a968a66aa0b5", + "rev": "f4a9b65f788ac437649fea95a905bc9e92c0e668", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1736013363, - "narHash": "sha256-P4lsS2Y5GzBfC8OfXtD/xWEucX6oHGTjOzjEjEJbXfc=", + "lastModified": 1736066484, + "narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d7908bd09165db6699908b7e3970f137327cbf0", + "rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735922141, - "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1735844895, - "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", + "lastModified": 1736064798, + "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=", "owner": "Mic92", "repo": "sops-nix", - "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", + "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index db4c98f..0ff524f 100644 --- a/home/home.nix +++ b/home/home.nix @@ -249,10 +249,10 @@ wineWowPackages.stagingFull winetricks - (unstable.yabridge.override { + (yabridge.override { wine = wineWowPackages.stagingFull; }) - (unstable.yabridgectl.override { + (yabridgectl.override { wine = wineWowPackages.stagingFull; }) @@ -291,7 +291,7 @@ # audacity tenacity supercollider-with-plugins - # pkgs.unstable.bitwig-studio + #unstable.bitwig-studio bitwig-studio-beta blender davinci-resolve-studio @@ -306,6 +306,8 @@ inkscape gimp epson-escpr + epson-escpr2 + epsonscan2 kicad turbocase openscad-unstable @@ -623,8 +625,6 @@ arguments = ["-n" "-r"]; }; }; - opensnitch-ui.enable = true; - # clipman.enable = true; }; xdg.systemDirs.data = [ diff --git a/packages/bitwig-beta/bitwig-studio-beta.nix b/packages/bitwig-beta/bitwig-studio-beta.nix index ef9ec2c..08d964e 100644 --- a/packages/bitwig-beta/bitwig-studio-beta.nix +++ b/packages/bitwig-beta/bitwig-studio-beta.nix @@ -20,6 +20,7 @@ makeWrapper, pango, pipewire, + wireplumber, pulseaudio, vulkan-loader, wrapGAppsHook3, @@ -70,6 +71,7 @@ stdenv.mkDerivation rec { libxkbcommon pango pipewire + wireplumber pulseaudio (lib.getLib stdenv.cc.cc) vulkan-loader