diff options
| -rw-r--r-- | machines/firelink.nix | 26 | ||||
| -rw-r--r-- | modules/desktop.nix | 26 |
2 files changed, 17 insertions, 35 deletions
diff --git a/machines/firelink.nix b/machines/firelink.nix index 8621f92..5a3eac5 100644 --- a/machines/firelink.nix +++ b/machines/firelink.nix @@ -65,32 +65,6 @@ in { user = "guest"; }; - hardware.pulseaudio = { - enable = true; - extraModules = [ pkgs.pulseaudio-modules-bt ]; - package = lib.mkForce pkgs.pulseaudioFull; - # extraConfig = '' - # load-module module-dbus-protocol - # load-module module-jack-sink channels=2 - # load-module module-jack-source channels=1 - # ''; - systemWide = true; - # configFile = pkgs.writeText "default.pa" '' - # load-module module-bluetooth-policy - # load-module module-bluetooth-discover - # ## module fails to load with - # ## module-bluez5-device.c: Failed to get device path from module arguments - # ## module.c: Failed to load module "module-bluez5-device" (argument: ""): initialization failed. - # # load-module module-bluez5-device - # # load-module module-bluez5-discover - # ''; - }; - systemd.services.pulseaudio = { - # environment."JACK_PROMISCUOUS_SERVER" = "jackaudio"; - serviceConfig = { LimitMEMLOCK = "infinity"; }; - }; - # users.extraUsers.pulse.extraGroups = [ "jackaudio" ]; - networking.firewall.allowedTCPPorts = [ 22 4713 ]; networking.networkmanager.enable = true; networking.networkmanager.wifi.powersave = false; diff --git a/modules/desktop.nix b/modules/desktop.nix index c37c438..45970bf 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -29,17 +29,25 @@ in { }; bluetooth.enable = true; - pulseaudio = { - enable = true; - support32Bit = true; - package = pkgs.pulseaudioFull; - zeroconf.discovery.enable = true; - zeroconf.publish.enable = true; - tcp.enable = true; - tcp.anonymousClients.allowAll = true; - }; + # pulseaudio = { + # enable = true; + # support32Bit = true; + # package = pkgs.pulseaudioFull; + # zeroconf.discovery.enable = true; + # zeroconf.publish.enable = true; + # tcp.enable = true; + # tcp.anonymousClients.allowAll = true; + # }; }; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + fonts = { enableDefaultFonts = true; fonts = with pkgs; [ |