diff options
Diffstat (limited to 'modules/nixos')
| -rw-r--r-- | modules/nixos/defaults/default.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/defaults/desktop.nix (renamed from modules/nixos/defaults/desktop-programs.nix) | 4 | ||||
| -rw-r--r-- | modules/nixos/mixins/pipewire.nix | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/modules/nixos/defaults/default.nix b/modules/nixos/defaults/default.nix index 1b11d0e..dfdf87d 100644 --- a/modules/nixos/defaults/default.nix +++ b/modules/nixos/defaults/default.nix @@ -2,7 +2,7 @@ { imports = [ - ./desktop-programs.nix + ./desktop.nix ./fonts.nix ./nix.nix ./programs.nix diff --git a/modules/nixos/defaults/desktop-programs.nix b/modules/nixos/defaults/desktop.nix index 3c8499d..4ba5917 100644 --- a/modules/nixos/defaults/desktop-programs.nix +++ b/modules/nixos/defaults/desktop.nix @@ -21,6 +21,10 @@ programs = { chromium.enable = lib.mkDefault true; }; + + services = { + pipewire.enable = true; + }; }) ]; } diff --git a/modules/nixos/mixins/pipewire.nix b/modules/nixos/mixins/pipewire.nix index 838e49f..cf2d492 100644 --- a/modules/nixos/mixins/pipewire.nix +++ b/modules/nixos/mixins/pipewire.nix @@ -4,7 +4,6 @@ config = lib.mkMerge [ { services.pipewire = lib.mkDefault { - wireplumber.enable = true; alsa.enable = true; jack.enable = true; pulse.enable = true; @@ -13,6 +12,10 @@ (lib.mkIf config.services.pipewire.enable { security.rtkit.enable = true; + + services.pipewire = { + wireplumber.enable = true; + }; }) ]; } |