From a8f9d8108d8273fe14d3cf355e212d4dde776b74 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Wed, 28 May 2025 18:16:17 +0200
Subject: [PATCH] Reshuffle modules a bit

---
 hosts/fern/default.nix                      | 6 +++---
 hosts/north/default.nix                     | 2 +-
 modules/home/shell/aliases.nix              | 2 +-
 modules/home/shell/default.nix              | 4 ++--
 modules/home/shell/p10k/default.nix         | 2 +-
 modules/system/{services => }/bluetooth.nix | 4 ++--
 modules/system/{services => }/sound.nix     | 4 ++--
 modules/system/{services => }/wlan.nix      | 4 ++--
 users/seb/home.nix                          | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename modules/system/{services => }/bluetooth.nix (61%)
 rename modules/system/{services => }/sound.nix (72%)
 rename modules/system/{services => }/wlan.nix (93%)

diff --git a/hosts/fern/default.nix b/hosts/fern/default.nix
index 7bb0d32..3e25469 100644
--- a/hosts/fern/default.nix
+++ b/hosts/fern/default.nix
@@ -24,12 +24,12 @@
     dm.tuigreet.enable = true;
     de.hyprland.enable = true;
 
+    wlan.enable = true;
+    bluetooth.enable = true;
+    sound.enable = true;
     virtualisation.enable = true;
 
     services = {
-      wlan.enable = true;
-      bluetooth.enable = true;
-      sound.enable = true;
       gc.enable = true;
       geoclue.enable = true;
       tailscale = {
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index be554dc..1e0843a 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -24,10 +24,10 @@
     dm.tuigreet.enable = true;
     de.hyprland.enable = true;
 
+    sound.enable = true;
     virtualisation.enable = true;
 
     services = {
-      sound.enable = true;
       gc.enable = true;
       geoclue.enable = true;
       tailscale = {
diff --git a/modules/home/shell/aliases.nix b/modules/home/shell/aliases.nix
index cc66587..5b9a25e 100644
--- a/modules/home/shell/aliases.nix
+++ b/modules/home/shell/aliases.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  config = lib.mkIf config.custom.shell.zsh.enable {
+  config = lib.mkIf config.custom.programs.shell.zsh.enable {
     home.packages = [
       pkgs.eza
       pkgs.bat
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 6986c2b..2971031 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -5,9 +5,9 @@
   ...
 }:
 {
-  options.custom.shell.zsh.enable = lib.mkEnableOption "";
+  options.custom.programs.shell.zsh.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.shell.zsh.enable {
+  config = lib.mkIf config.custom.programs.shell.zsh.enable {
     programs = {
       zsh = {
         enable = true;
diff --git a/modules/home/shell/p10k/default.nix b/modules/home/shell/p10k/default.nix
index 834e3d0..fde84f4 100644
--- a/modules/home/shell/p10k/default.nix
+++ b/modules/home/shell/p10k/default.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  config = lib.mkIf config.custom.shell.zsh.enable {
+  config = lib.mkIf config.custom.programs.shell.zsh.enable {
     programs.zsh = {
       plugins = [
         {
diff --git a/modules/system/services/bluetooth.nix b/modules/system/bluetooth.nix
similarity index 61%
rename from modules/system/services/bluetooth.nix
rename to modules/system/bluetooth.nix
index 31d4f36..bb6ffa4 100644
--- a/modules/system/services/bluetooth.nix
+++ b/modules/system/bluetooth.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.custom.services.bluetooth.enable = lib.mkEnableOption "";
+  options.custom.bluetooth.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.services.bluetooth.enable {
+  config = lib.mkIf config.custom.bluetooth.enable {
     hardware = {
       bluetooth = {
         enable = true;
diff --git a/modules/system/services/sound.nix b/modules/system/sound.nix
similarity index 72%
rename from modules/system/services/sound.nix
rename to modules/system/sound.nix
index b918985..f3057c8 100644
--- a/modules/system/services/sound.nix
+++ b/modules/system/sound.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 {
-  options.custom.services.sound.enable = lib.mkEnableOption "";
+  options.custom.sound.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.services.sound.enable {
+  config = lib.mkIf config.custom.sound.enable {
     security.rtkit.enable = true;
     services = {
       pulseaudio.enable = false;
diff --git a/modules/system/services/wlan.nix b/modules/system/wlan.nix
similarity index 93%
rename from modules/system/services/wlan.nix
rename to modules/system/wlan.nix
index 061ff14..8d24607 100644
--- a/modules/system/services/wlan.nix
+++ b/modules/system/wlan.nix
@@ -13,9 +13,9 @@ let
   ];
 in
 {
-  options.custom.services.wlan.enable = lib.mkEnableOption "";
+  options.custom.wlan.enable = lib.mkEnableOption "";
 
-  config = lib.mkIf config.custom.services.wlan.enable (
+  config = lib.mkIf config.custom.wlan.enable (
     lib.mkMerge [
       {
         networking.wireless.iwd = {
diff --git a/users/seb/home.nix b/users/seb/home.nix
index a164a93..1fb14a5 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -25,9 +25,9 @@ in
 
   custom = {
     sops.enable = true;
-    shell.zsh.enable = true;
 
     programs = {
+      shell.zsh.enable = true;
       kitty.enable = true;
       firefox.enable = true;
       git.enable = true;