Jan/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Jan:9089f9d93609257406536f18c61097c5c718f39b
Branches Tags
Jan:main
Jan:disko
..
compare: Jan:ca9757fecb9e44042aa31b57caf0dc66a6e4f33b
Branches Tags
Jan:main
Jan:disko

No commits in common. "9089f9d93609257406536f18c61097c5c718f39b" and "ca9757fecb9e44042aa31b57caf0dc66a6e4f33b" have entirely different histories.
9089f9d936 ... ca9757fecb

3 changed files with 5 additions and 47 deletions
Show Stats Expand all files Collapse all files

32
machines/vm-audio.nix
View File

@ -29,7 +29,6 @@
pulsemixer pulsemixer
adwaita-icon-theme adwaita-icon-theme
open-stage-control open-stage-control
carla_osc_bridge
# Add LV2 plugins # Add LV2 plugins
lsp-plugins lsp-plugins
@ -61,10 +60,10 @@
pipewire.jack pipewire.jack
] ]
)}"; )}";
qt = { # qt = {
enable = true; # enable = true;
style = "adwaita"; # style = "adwaita";
}; # };
xdg.icons = { xdg.icons = {
enable = true; enable = true;
fallbackCursorThemes = [ "Adwaita" ]; fallbackCursorThemes = [ "Adwaita" ];
@ -125,27 +124,6 @@
}; };
}; };
# Carla service
systemd.user.services.carla-bridge = {
description = "Carla OSC Bridge";
wantedBy = [ "default.target" ];
after = [
"network.target"
"sound.target"
];
requires = [
"carla.service"
];
unitConfig = {
ConditionUser = "mixer";
};
serviceConfig = {
ExecStart = "${pkgs.carla_osc_bridge}/bin/carla_osc_bridge --clients \"127.0.0.1:8080\"";
Restart = "always";
RestartSec = 5;
};
};
# Open stage control service # Open stage control service
systemd.user.services.osc = { systemd.user.services.osc = {
description = "OSC Service"; description = "OSC Service";
@ -160,7 +138,7 @@
ConditionUser = "mixer"; ConditionUser = "mixer";
}; };
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.open-stage-control}/bin/open-stage-control --no-gui --send 127.0.0.1:10402 --load /home/mixer/open-stage-control/session.json --theme /home/mixer/open-stage-control/theme.css"; ExecStart = "${pkgs.open-stage-control}/bin/open-stage-control --no-gui --send 127.0.0.1:22752 --load /home/mixer/open-stage-control/session.json --theme /home/mixer/open-stage-control/theme.css";
Environment = "\"ELECTRON_RUN_AS_NODE=1\""; Environment = "\"ELECTRON_RUN_AS_NODE=1\"";
Restart = "always"; Restart = "always";
RestartSec = 5; RestartSec = 5;

1
pkgs/default.nix
View File

@ -12,7 +12,6 @@ let
wprs = prev.callPackage ./programs/wprs/default.nix { }; wprs = prev.callPackage ./programs/wprs/default.nix { };
nixgreety = prev.callPackage ./programs/nixgreety.nix { }; nixgreety = prev.callPackage ./programs/nixgreety.nix { };
carla_osc_bridge = prev.callPackage ./programs/carla_osc_bridge.nix { };
# ly = prev.callPackage ./programs/ly/default.nix { }; # ly = prev.callPackage ./programs/ly/default.nix { };
}; };
in in

19
pkgs/programs/carla_osc_bridge.nix
View File

@ -1,19 +0,0 @@
{ pkgs, ... }:
with pkgs;
rustPlatform.buildRustPackage {
pname = "carla_osc_bridge";
version = "master";
src = fetchFromGitea {
domain = "git.bulthuis.dev";
owner = "Jan";
repo = "carla_osc_bridge";
rev = "8966a25e8d56efa30a28fd320c6f657040a1f01c";
hash = "sha256-AJ+hb642V/aqizbM4URaZhFSIFwSvGa23HIkHqIru2o=";
};
cargoHash = "sha256-s1ZKbhHudgPOy7613zbT8TkbM6B7oloLEuTYHoWjX5o=";
useFetchCargoVendor = true;
}