fixing yabridge and more reorg

This commit is contained in:
Matt Nish-Lapidus 2025-02-09 00:31:36 -05:00
parent 65d2b91057
commit 2763ce58c1
5 changed files with 24 additions and 24 deletions

12
flake.lock generated
View file

@ -90,11 +90,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1738919824, "lastModified": 1739067033,
"narHash": "sha256-FvaTbPs4O4NmE71xjb/lNSsNAkyXUnm7NU/bY86oUws=", "narHash": "sha256-On2apbig9LjjSJDDzyCUZkxdWoQIBOavaG02vh693PQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d1a312c524fe9f1a6836fc3fd63c6fd09f795abb", "rev": "6c02db1d65ff3c8d1a871c50bd2cdf3b4822fafd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1070,11 +1070,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1739020877,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799ba5bffed04ced7067a91798353d360788b30d", "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -16,15 +16,15 @@
paulxstretch paulxstretch
]) ])
(nix-config.pkgs-stable.yabridge.override {
wine = pkgs.wineWowPackages.stagingFull;
})
(nix-config.pkgs-stable.yabridgectl.override {
wine = pkgs.wineWowPackages.stagingFull;
})
(with pkgs; [ (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 supercollider-with-plugins
carla carla

View file

@ -1,6 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
with pkgs.lib.nix-rice; with pkgs.lib.nix-rice;
let strPalette = palette.toRGBAHex pkgs.rice.colorPalette; let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
in { in {
programs = { programs = {
@ -157,7 +157,7 @@ in {
enable = true; enable = true;
active.gradient = { active.gradient = {
from = strPalette.normal.magenta; from = strPalette.normal.magenta;
to = strPalette.dark.cyan; to = strPalette.normal.cyan;
angle = 180; angle = 180;
in' = "srgb-linear"; in' = "srgb-linear";
}; };

View file

@ -43,12 +43,12 @@ in {
green = theme.color10; green = theme.color10;
yellow = theme.color11; yellow = theme.color11;
blue = theme.color12; blue = theme.color12;
# magenta = { magenta = {
# a = 1.0; a = 1.0;
# r = 198; r = 198;
# g = 120; g = 120;
# b = 221; b = 221;
# }; };
cyan = theme.color14; cyan = theme.color14;
white = theme.color15; white = theme.color15;
}; };

View file

@ -28,10 +28,10 @@ rustPlatform.buildRustPackage rec {
src = fetchzip { src = fetchzip {
url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; 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 = [ nativeBuildInputs = [
installShellFiles installShellFiles