From 384f221e16c9eb344614dd5c6a8216ee42ced195 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 13 Feb 2025 22:01:41 -0500 Subject: nixos/pipewire: only enable wireplumber with pipewire --- modules/nixos/defaults/default.nix | 2 +- modules/nixos/defaults/desktop-programs.nix | 26 ------------------------- modules/nixos/defaults/desktop.nix | 30 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 modules/nixos/defaults/desktop-programs.nix create mode 100644 modules/nixos/defaults/desktop.nix (limited to 'modules/nixos/defaults') 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-programs.nix deleted file mode 100644 index 3c8499d..0000000 --- a/modules/nixos/defaults/desktop-programs.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - config = lib.mkMerge [ - { - services.xserver = { - excludePackages = [ pkgs.xterm ]; - }; - } - - (lib.mkIf config.services.xserver.enable { - environment.systemPackages = [ - pkgs.wl-clipboard - ]; - - programs = { - chromium.enable = lib.mkDefault true; - }; - }) - ]; -} diff --git a/modules/nixos/defaults/desktop.nix b/modules/nixos/defaults/desktop.nix new file mode 100644 index 0000000..4ba5917 --- /dev/null +++ b/modules/nixos/defaults/desktop.nix @@ -0,0 +1,30 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + config = lib.mkMerge [ + { + services.xserver = { + excludePackages = [ pkgs.xterm ]; + }; + } + + (lib.mkIf config.services.xserver.enable { + environment.systemPackages = [ + pkgs.wl-clipboard + ]; + + programs = { + chromium.enable = lib.mkDefault true; + }; + + services = { + pipewire.enable = true; + }; + }) + ]; +} -- cgit v1.2.3