fix: fix conflicting

misumisumi · May 12, 2024 · 23415ca · 23415ca
1 parent 2f2aa4b
commit 23415ca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/apps/xserver/default.nix b/apps/xserver/default.nix
@@ -3,9 +3,10 @@
 , pkgs
 , user
 , useNixOSWallpaper
+, wm
 , ...
 }: {
-  imports = [ ./gsettings.nix ];
+  imports = lib.optional (wm != "gnome") ./gsettings.nix;
   users.groups = {
     video.members = [ "${user}" ];
   };

diff --git a/system/pipewire/default.nix b/system/pipewire/default.nix
@@ -1,13 +1,18 @@
 # Please add apps/security for enabling rtkit
-{ pkgs
+{ lib
+, pkgs
 , user
 , ...
 }:
 {
-  users.groups = {
-    audio.members = [ "${user}" ];
-  };
-  sound.enable = false;
+  environment.systemPackages = with pkgs; [
+    pulseaudio
+    pavucontrol
+    paprefs
+    portaudio
+  ];
+  # environment.etc."pipewire/pipewire-pulse.conf".source = ./pipewire-conf/pipewire-pulse.conf;
+  hardware.pulseaudio.enable = lib.mkForce false;
   security.rtkit.enable = true;
   services = {
     pipewire = {
@@ -21,11 +26,8 @@
       jack.enable = true;
     };
   };
-  environment.systemPackages = with pkgs; [
-    pulseaudio
-    pavucontrol
-    paprefs
-    portaudio
-  ];
-  # environment.etc."pipewire/pipewire-pulse.conf".source = ./pipewire-conf/pipewire-pulse.conf;
+  sound.enable = lib.mkForce false;
+  users.groups = {
+    audio.members = [ "${user}" ];
+  };
 }