mirror of
https://forgejo.merr.is/annika/nixos.git
synced 2025-12-12 14:37:52 -05:00
Moved Audio Config to New File
Added service to set up passthrough from my work laptop
This commit is contained in:
parent
93764b9520
commit
e92487487e
4 changed files with 73 additions and 17 deletions
39
hosts/envy/hardware-configuration.nix
Normal file
39
hosts/envy/hardware-configuration.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports =
|
||||||
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" =
|
||||||
|
{ device = "/dev/disk/by-uuid/a9a6d64b-bcf3-44e6-8c1a-fdb8d68d124c";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{ device = "/dev/disk/by-uuid/ABD8-19B1";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
29
hosts/kim/audio.nix
Normal file
29
hosts/kim/audio.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
{
|
||||||
|
# Enable sound with pipewire.
|
||||||
|
sound.enable = true;
|
||||||
|
hardware.pulseaudio.enable = false;
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
alsa.support32Bit = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
# If you want to use JACK applications, uncomment this
|
||||||
|
#jack.enable = true;
|
||||||
|
|
||||||
|
# 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;
|
||||||
|
};
|
||||||
|
systemd.user.services.pipewire-patching = {
|
||||||
|
description = "pipewire patches";
|
||||||
|
|
||||||
|
wantedBy = [ "default.target" ];
|
||||||
|
|
||||||
|
script = ''
|
||||||
|
pw-link "alsa_output.pci-0000_0e_00.4.iec958-stereo:playback_FL" "alsa_input.pci-0000_0e_00.4.analog-stereo:capture_FL"
|
||||||
|
pw-link "alsa_output.pci-0000_0e_00.4.iec958-stereo:playback_FR" "alsa_input.pci-0000_0e_00.4.analog-stereo:capture_FR"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -14,6 +14,7 @@ inputs.nixpkgs.lib.nixosSystem {
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./gui.nix
|
./gui.nix
|
||||||
|
./audio.nix
|
||||||
../../modules/common
|
../../modules/common
|
||||||
../../modules/nixos
|
../../modules/nixos
|
||||||
{
|
{
|
||||||
|
|
@ -59,23 +60,6 @@ inputs.nixpkgs.lib.nixosSystem {
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
hardware.bluetooth.powerOnBoot = true;
|
hardware.bluetooth.powerOnBoot = true;
|
||||||
# Enable sound with pipewire.
|
|
||||||
sound.enable = true;
|
|
||||||
hardware.pulseaudio.enable = false;
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
# If you want to use JACK applications, uncomment this
|
|
||||||
#jack.enable = true;
|
|
||||||
|
|
||||||
# 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;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
# gui.enable = true;
|
# gui.enable = true;
|
||||||
# Apps
|
# Apps
|
||||||
|
|
|
||||||
4
hosts/kim/pw-link.sh
Normal file
4
hosts/kim/pw-link.sh
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
#!/user/bin/env bash
|
||||||
|
|
||||||
|
pw-link "alsa_output.pci-0000_0e_00.4.iec958-stereo:playback_FL" "alsa_input.pci-0000_0e_00.4.analog-stereo:capture_FL"
|
||||||
|
pw-link "alsa_output.pci-0000_0e_00.4.iec958-stereo:playback_FR" "alsa_input.pci-0000_0e_00.4.analog-stereo:capture_FR"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue