diff --git a/configurations/desktop/home.nix b/configurations/desktop/home.nix index bdb767b7..d6440824 100644 --- a/configurations/desktop/home.nix +++ b/configurations/desktop/home.nix @@ -91,7 +91,8 @@ #}; programs.bash.shellAliases = { - nixos-rebuild-system-flake = "sudo nixos-rebuild switch --flake /etc/nixos#desktop"; + nixos-rebuild-system-flake-switch = "sudo nixos-rebuild switch --flake /etc/nixos#desktop"; + nixos-rebuild-system-flake-build = "sudo nixos-rebuild build --flake /etc/nixos#desktop"; }; } diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix index 22baa72f..e6a80d11 100644 --- a/configurations/laptop/home.nix +++ b/configurations/laptop/home.nix @@ -49,7 +49,8 @@ }; programs.bash.shellAliases = { - nixos-rebuild-system-flake = "sudo nixos-rebuild switch --flake /etc/nixos#laptop"; + nixos-rebuild-system-flake-switch = "sudo nixos-rebuild switch --flake /etc/nixos#laptop"; + nixos-rebuild-system-flake-build = "sudo nixos-rebuild build --flake /etc/nixos#laptop"; }; home.sessionVariables = { diff --git a/global.nix b/global.nix index e45ad3be..41292ad1 100644 --- a/global.nix +++ b/global.nix @@ -258,14 +258,17 @@ qpwgraph #ardour - #rnnoise-plugin + (writeShellScriptBin "ardour-pipewire" ''exec ${pipewire.jack}/bin/pw-jack ${ardour}/bin/ardour8'') + #easyeffects + rnnoise-plugin #lsp-plugins - (yabridge.override { wine = wineWowPackages.waylandFull; }) - (yabridgectl.override { wine = wineWowPackages.waylandFull; }) + #(yabridge.override { wine = wineWowPackages.waylandFull; }) + #(yabridgectl.override { wine = wineWowPackages.waylandFull; }) #(yabridge.override { wine = wineWowPackages.full; }) #(yabridgectl.override { wine = wineWowPackages.full; }) audacity - lmms + #lmms + #carla furnace vgm2x diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix index d9ff3de7..7b73d80a 100644 --- a/modules/nixos/cspark-desktop-niri/home.nix +++ b/modules/nixos/cspark-desktop-niri/home.nix @@ -39,6 +39,9 @@ in wlsunset -l 51.5 -L 0.1 & kdeconnect-indicator & + #pactl load-module module-null-sink media.class=Audio/Source/Virtual sink_name=processed-mic channel_map=front-left,front-right & + qpwgraph & + # Xwayland support via xwayland-satellite-flake export DISPLAY=":0" xwayland-satellite & diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix index 3626ddaa..bac70c6f 100644 --- a/modules/nixos/cspark-desktop-niri/module.nix +++ b/modules/nixos/cspark-desktop-niri/module.nix @@ -43,6 +43,7 @@ in kdePackages.polkit-kde-agent-1 # Polkit Prompt for password prompts etc lxqt.lxqt-openssh-askpass # GUI to query passwords on behalf of SSH agents pavucontrol # Audio control + pipewire.jack (writeShellScriptBin "niri-start-session" '' @@ -115,6 +116,22 @@ in # use the example session manager (no others are packaged yet so this is enabled by default, # no need to redefine it in your config for now) #media-session.enable = true; + + # Virtual mic to route processed microphone or other devices simultaneously into + extraConfig.pipewire."91-processed-mic" = { + "context.objects" = [ + { + factory = "adapter"; + args = { + "factory.name" = "support.null-audio-sink"; + "node.name" = "Processed-Mic"; + "node.description" = "Virtual Processed Microphone"; + "media.class" = "Audio/Source/Virtual"; + "audio.position" = "FL,FR"; + }; + } + ]; + }; }; security.sudo = { diff --git a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/foot/foot.ini b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/foot/foot.ini index 52492d3f..53bfb362 100644 --- a/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/foot/foot.ini +++ b/modules/nixos/cspark-desktop-niri/resources/home-manager/.config/foot/foot.ini @@ -1,6 +1,6 @@ # -*- conf -*- # font=HackNerdFontMono-Regular:size=13 -font=SFMonoNerdFont-Regular:size=13 +font=SFMonoNerdFont-Regular:size=18.5 shell=bash -c 'nvim +terminal && bash' # Gruvbox - Light