From 2690792a88a004c7a0685e00adf705e00b624be8 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Fri, 5 Apr 2024 16:33:51 -0400
Subject: [PATCH] integrated sound settings into default systemConfig

---
 nixosModules/systemConfig/default.nix | 38 ++++++++++++++++++++++-----
 nixosModules/systemConfig/network.nix |  5 ----
 nixosModules/systemConfig/sound.nix   | 18 -------------
 3 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 nixosModules/systemConfig/sound.nix

diff --git a/nixosModules/systemConfig/default.nix b/nixosModules/systemConfig/default.nix
index 50ba06a4..76a2f013 100644
--- a/nixosModules/systemConfig/default.nix
+++ b/nixosModules/systemConfig/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports =
-    [ ./network.nix ./sound.nix ./plymouth ./power-profiles-daemon ./zramSwap ];
+    [ ./network.nix ./plymouth ./power-profiles-daemon ./zramSwap ];
 
   systemConfig.power-profiles-daemon.enable = lib.mkDefault true;
 
@@ -25,6 +25,11 @@
     };
   };
 
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
   hardware = {
     # Enable Bluetooth connections.
     bluetooth.enable = true;
@@ -35,15 +40,34 @@
     };
     # Add support for configuring QMK keyboards with Via.
     keyboard.qmk.enable = true;
+
+    pulseaudio = {
+      enable = lib.mkForce false;
+      # Enables extra codecs like aptx.
+      package = pkgs.pulseaudioFull;
+    };
   };
 
-  services.logind.extraConfig = ''
-    # Don't shutdown when power button is short-pressed
-    HandlePowerKey=suspend
-    HandlePowerKeyLongPress=poweroff
-  '';
+  sound.enable = true;
 
-  security.polkit.enable = true;
+  services = {
+    logind.extraConfig = ''
+      # Don't shutdown when power button is short-pressed
+      HandlePowerKey=suspend
+      HandlePowerKeyLongPress=poweroff
+    '';
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
+  };
+
+  security = {
+    polkit.enable = true;
+    rtkit.enable = true;
+  };
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
diff --git a/nixosModules/systemConfig/network.nix b/nixosModules/systemConfig/network.nix
index a9781dbb..72077830 100644
--- a/nixosModules/systemConfig/network.nix
+++ b/nixosModules/systemConfig/network.nix
@@ -31,11 +31,6 @@
     ];
   };
 
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
   services = {
     # Enable avahi for auto network discovery.
     avahi = {
diff --git a/nixosModules/systemConfig/sound.nix b/nixosModules/systemConfig/sound.nix
deleted file mode 100644
index efcbb5b8..00000000
--- a/nixosModules/systemConfig/sound.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio = {
-    enable = lib.mkForce false;
-    # Enables extra codecs like aptx.
-    package = pkgs.pulseaudioFull;
-  };
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-}