From 2763ce58c1d304990e533d18bb31132c3b942526 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 9 Feb 2025 00:31:36 -0500 Subject: [PATCH] fixing yabridge and more reorg --- flake.lock | 12 ++++++------ modules/home/music.nix | 16 ++++++++-------- modules/home/niri.nix | 4 ++-- overlays/rice.nix | 12 ++++++------ packages/rbw-latest.nix | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 526f82f..3d6609a 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1738919824, - "narHash": "sha256-FvaTbPs4O4NmE71xjb/lNSsNAkyXUnm7NU/bY86oUws=", + "lastModified": 1739067033, + "narHash": "sha256-On2apbig9LjjSJDDzyCUZkxdWoQIBOavaG02vh693PQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d1a312c524fe9f1a6836fc3fd63c6fd09f795abb", + "rev": "6c02db1d65ff3c8d1a871c50bd2cdf3b4822fafd", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { diff --git a/modules/home/music.nix b/modules/home/music.nix index bf4b6fd..77c4366 100644 --- a/modules/home/music.nix +++ b/modules/home/music.nix @@ -16,15 +16,15 @@ paulxstretch ]) - (nix-config.pkgs-stable.yabridge.override { - wine = pkgs.wineWowPackages.stagingFull; - }) - (nix-config.pkgs-stable.yabridgectl.override { - wine = pkgs.wineWowPackages.stagingFull; - }) - (with pkgs; [ - bitwig-studio5-latest # from audio flake + bitwig-studio5-latest + + (nix-config.pkgs-stable.yabridge.override { + wine = wineWowPackages.stagingFull; + }) + (nix-config.pkgs-stable.yabridgectl.override { + wine = wineWowPackages.stagingFull; + }) supercollider-with-plugins carla diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 87a6f9a..94a9d58 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: with pkgs.lib.nix-rice; -let strPalette = palette.toRGBAHex pkgs.rice.colorPalette; +let strPalette = palette.toRGBHex pkgs.rice.colorPalette; in { programs = { @@ -157,7 +157,7 @@ in { enable = true; active.gradient = { from = strPalette.normal.magenta; - to = strPalette.dark.cyan; + to = strPalette.normal.cyan; angle = 180; in' = "srgb-linear"; }; diff --git a/overlays/rice.nix b/overlays/rice.nix index c570c23..9365c0f 100644 --- a/overlays/rice.nix +++ b/overlays/rice.nix @@ -43,12 +43,12 @@ in { green = theme.color10; yellow = theme.color11; blue = theme.color12; - # magenta = { - # a = 1.0; - # r = 198; - # g = 120; - # b = 221; - # }; + magenta = { + a = 1.0; + r = 198; + g = 120; + b = 221; + }; cyan = theme.color14; white = theme.color15; }; diff --git a/packages/rbw-latest.nix b/packages/rbw-latest.nix index 308d666..62bd10a 100644 --- a/packages/rbw-latest.nix +++ b/packages/rbw-latest.nix @@ -28,10 +28,10 @@ rustPlatform.buildRustPackage rec { src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - hash = "sha256-6T1pa+LzgJLaPbWJg7imZZ6KuGJ47YqpSKXxrv4E+1I="; + hash = "sha256-ebLbdIF+BybK7ssNtZacGWmAEwdNZh8b94QYgvcwzmM="; }; - cargoHash = "sha256-swEKG7o59LulwwtdYfRc5x1Wki4dFdT0bMlG7ksbQ4E="; + cargoHash = "sha256-QngSXKwqKHoAnA6ELAkS8v0exQwBxT/FCOPPj5WM5LE="; nativeBuildInputs = [ installShellFiles