From ff029aea41e27616494bb6cc696be7bff858b8cc Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Thu, 8 Feb 2024 16:53:38 +0100
Subject: [PATCH] Fix a lot of module options

---
 system/common/desktop.nix | 2 +-
 system/common/me.nix      | 5 ++++-
 system/common/remote.nix  | 2 +-
 system/profile/base.nix   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/system/common/desktop.nix b/system/common/desktop.nix
index 61119d8..edf5df4 100644
--- a/system/common/desktop.nix
+++ b/system/common/desktop.nix
@@ -22,7 +22,7 @@ in
       profile.base.enable = true;
       packageSets.multimedia.enable = mkDefault true;
       programs.syncthing.enable = mkDefault true;
-      common = {
+      hardware = {
         bluetooth.enable = mkDefault true;
         sound.enable = mkDefault true;
       };
diff --git a/system/common/me.nix b/system/common/me.nix
index c60924d..74c3271 100644
--- a/system/common/me.nix
+++ b/system/common/me.nix
@@ -3,7 +3,10 @@ let
   cfg = config.nixfiles.common.me;
 in
 {
-  options.nixfiles.common.me = lib.mkEnableOption "my user account";
+  options.nixfiles.common.me = {
+    enable = lib.mkEnableOption "my user account";
+  };
+
   config = lib.mkIf cfg.enable {
     users.users.nullbite = {
       isNormalUser = true;
diff --git a/system/common/remote.nix b/system/common/remote.nix
index b941501..699e0d2 100644
--- a/system/common/remote.nix
+++ b/system/common/remote.nix
@@ -19,5 +19,5 @@ in
     networking.wireguard.enable = true;
   };
   options = {
-    nixfiles.common.remoteAccess = lib.mkEnableOption "remote access options" ; };
+    nixfiles.common.remoteAccess.enable = lib.mkEnableOption "remote access options" ; };
 }
diff --git a/system/profile/base.nix b/system/profile/base.nix
index 8301dd4..589f681 100644
--- a/system/profile/base.nix
+++ b/system/profile/base.nix
@@ -12,7 +12,7 @@ in
     (lib.mkIf cfg.enable {
 
       # Enable my account
-      nixfiles.common.me = lib.mkDefault true;
+      nixfiles.common.me.enable = lib.mkDefault true;
 
       # locale settings
       i18n = {