modules/profiles: consolidated into common/xorg profiles

4 files changed, 18 insertions, 23 deletions

diff --git a/modules/profiles/common/default.nix b/modules/profiles/common/default.nix
index da7df0f..d364a7f 100644
--- a/modules/profiles/common/default.nix
+++ b/modules/profiles/common/default.nix
@@ -39,6 +39,14 @@
     ];
   };
 
+  security = {
+    polkit.enable = true;
+    sudo = {
+      enable = lib.mkDefault true;
+      wheelNeedsPassword = lib.mkDefault false;
+    };
+  };
+
   programs = {
     git.enable = true;
     htop.enable = true;
diff --git a/modules/profiles/pipewire/default.nix b/modules/profiles/pipewire/default.nix
deleted file mode 100644
index ac70f08..0000000
--- a/modules/profiles/pipewire/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-{
-  services.pipewire = {
-    enable = true;
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-    pulse.enable = true;
-  };
-
-  security.rtkit.enable = true;
-}
diff --git a/modules/profiles/security/default.nix b/modules/profiles/security/default.nix
deleted file mode 100644
index de73534..0000000
--- a/modules/profiles/security/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, ... }:
-{
-  security = {
-    polkit.enable = true;
-    sudo = {
-      enable = lib.mkDefault true;
-      wheelNeedsPassword = lib.mkDefault false;
-    };
-  };
-}
diff --git a/modules/profiles/xorg/default.nix b/modules/profiles/xorg/default.nix
index fce4b26..8004d05 100644
--- a/modules/profiles/xorg/default.nix
+++ b/modules/profiles/xorg/default.nix
@@ -24,6 +24,16 @@
     windowManager.bspwm.enable = true;
   };
 
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
+  };
+
   environment.systemPackages = with pkgs.xorg; [
     libX11
     xset