NixOS 24.05

This commit is contained in:
Agatha Lovelace 2024-09-05 17:51:23 +02:00
parent 7c53de5379
commit 260898d505
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
4 changed files with 28 additions and 35 deletions

View File

@ -9,5 +9,5 @@
wantedBy = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ];
}; };
users.users.agatha.packages = [ pkgs.unstable.protonmail-bridge-gui ]; users.users.agatha.packages = [ pkgs.protonmail-bridge-gui ];
} }

View File

@ -4,7 +4,7 @@
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
pinentryFlavor = "gnome3"; pinentryPackage = pkgs.pinentry-gnome3;
enableExtraSocket = true; enableExtraSocket = true;
}; };

View File

@ -1,12 +1,12 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
vampysite.url = "git+https://git.lain.faith/sorceress/vampysite"; vampysite.url = "git+https://git.lain.faith/sorceress/vampysite";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View File

@ -66,35 +66,28 @@
}; };
# Creating separate mono sources for Tascam US-4x4HR # Creating separate mono sources for Tascam US-4x4HR
environment.etc."pipewire/pipewire.conf.d/91-us-4x4hr.conf".text = let services.pipewire.extraConfig.pipewire."91-us-4x4hr" = {
name = "US-4x4HR"; "context.modules" = let
target = "alsa_input.usb-TASCAM_US-4x4HR_no_serial_number-00.pro-input-0"; name = "US-4x4HR";
input = ch: '' target = "alsa_input.usb-TASCAM_US-4x4HR_no_serial_number-00.pro-input-0";
{ input = ch: {
name = libpipewire-module-loopback "name" = "libpipewire-module-loopback";
args = { "args" = {
node.description = "${name} Input ${toString ch} Mono" "node.description" = "${name} Input ${toString ch} Mono";
capture.props = { "capture.props" = {
node.name = "capture.${name}_ch${toString ch}" "node.name" = "capture.${name}_ch${toString ch}";
audio.position = [ AUX${toString ch} ] "audio.position" = [ "AUX${toString ch}" ];
stream.dont-remix = true "stream.dont-remix" = true;
target.object = "${target}" "target.object" = target;
node.passive = true "node.passive" = true;
} };
playback.props = { "playback.props" = {
node.name = "${name}_ch${toString ch}" "node.name" = "${name}_ch${toString ch}";
media.class = "Audio/Source" "media.class" = "Audio/Source";
audio.position = [ MONO ] "audio.position" = [ "MONO" ];
} };
} };
} };
''; in [ (input 0) (input 1) (input 2) (input 3) ];
in '' };
context.modules = [
${input 0}
${input 1}
${input 2}
${input 3}
]
'';
} }