diff --git a/nixosModules/drivers/gpu/amd.nix b/nixosModules/drivers/gpu/amd.nix
index ae31a4d..5c59ca9 100644
--- a/nixosModules/drivers/gpu/amd.nix
+++ b/nixosModules/drivers/gpu/amd.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }: {
 
-  options = {
-    settings.drivers.gpu.amd.enable = lib.mkEnableOption "enable AMD gpu drivers";
+  options.settings.drivers.gpu.amd = {
+    enable = lib.mkEnableOption "enable AMD gpu drivers";
   };
 
   config = lib.mkIf config.settings.drivers.gpu.amd.enable {
diff --git a/nixosModules/drivers/gpu/nvidia.nix b/nixosModules/drivers/gpu/nvidia.nix
index 3ebe916..bd70256 100644
--- a/nixosModules/drivers/gpu/nvidia.nix
+++ b/nixosModules/drivers/gpu/nvidia.nix
@@ -1,9 +1,9 @@
 { lib, config, ... }: {
 
-  options = {
-    settings.drivers.gpu.nvidia.enable = lib.mkEnableOption "Enable Nvidia proprietary drivers";
-    settings.drivers.gpu.nvidia.offload = lib.mkEnableOption "Enable prime offloading";
-    settings.drivers.gpu.nvidia.sync = lib.mkEnableOption "Enable prime sync";
+  options.settings.drivers.gpu.nvidia = {
+    enable = lib.mkEnableOption "Enable Nvidia proprietary drivers";
+    offload = lib.mkEnableOption "Enable prime offloading";
+    sync = lib.mkEnableOption "Enable prime sync";
   };
 
   config = lib.mkIf config.settings.drivers.gpu.nvidia.enable {
diff --git a/nixosModules/drivers/ipod.nix b/nixosModules/drivers/ipod.nix
index e94b67d..b927fbf 100644
--- a/nixosModules/drivers/ipod.nix
+++ b/nixosModules/drivers/ipod.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: {
 
-  options = {
-    settings.drivers.ipod.enable = lib.mkEnableOption "Enable necessary software for ipod communication";
+  options.settings.drivers.ipod = {
+    enable = lib.mkEnableOption "Enable necessary software for ipod communication";
   };
 
   config = lib.mkIf config.settings.drivers.ipod.enable {
diff --git a/nixosModules/drivers/samsung-printer.nix b/nixosModules/drivers/samsung-printer.nix
index f8ef95c..b7e1b77 100644
--- a/nixosModules/drivers/samsung-printer.nix
+++ b/nixosModules/drivers/samsung-printer.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: {
   #use driver compatible with samsung M2020 printer
-  options = {
-    settings.drivers.printer.M2020.enable = lib.mkEnableOption "use the appropriate driver for the samsung M2020 printer";
+  options.settings.drivers.printer = {
+    M2020.enable = lib.mkEnableOption "use the appropriate driver for the samsung M2020 printer";
   };
 
   config = lib.mkIf config.settings.drivers.printer.M2020.enable {
diff --git a/nixosModules/programs/docker.nix b/nixosModules/programs/docker.nix
index 280a3e9..e941b21 100644
--- a/nixosModules/programs/docker.nix
+++ b/nixosModules/programs/docker.nix
@@ -1,6 +1,6 @@
 { lib, config, ... }: {
-  options = {
-    settings.programs.docker.enable = lib.mkEnableOption "enables docker";
+  options.settings.programs.docker = {
+    enable = lib.mkEnableOption "enables docker";
   };
 
   config = lib.mkIf config.settings.programs.docker.enable {
diff --git a/nixosModules/programs/gnupg.nix b/nixosModules/programs/gnupg.nix
index efbf6fe..ca25e33 100644
--- a/nixosModules/programs/gnupg.nix
+++ b/nixosModules/programs/gnupg.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }: {
-  options.settings = {
-    programs.gnupg.enable = lib.mkEnableOption "enable gnuPG";
-    programs.gnupg.ssh = lib.mkEnableOption "enable gnuPG ssh integration";
+  options.settings.programs.gnupg = {
+    enable = lib.mkEnableOption "enable gnuPG";
+    ssh = lib.mkEnableOption "enable gnuPG ssh integration";
   };
 
   config = lib.mkIf config.settings.programs.gnupg.enable {
diff --git a/nixosModules/programs/powertop.nix b/nixosModules/programs/powertop.nix
index c863e8c..1de1e87 100644
--- a/nixosModules/programs/powertop.nix
+++ b/nixosModules/programs/powertop.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options = {
-    settings.programs.powertop.enable = lib.mkEnableOption "enables powertop";
+  options.settings.programs.powertop = {
+    enable = lib.mkEnableOption "enables powertop";
   };
 
   config = lib.mkIf config.settings.programs.powertop.enable {
diff --git a/nixosModules/programs/tailscale.nix b/nixosModules/programs/tailscale.nix
index cce8355..6eff0ba 100644
--- a/nixosModules/programs/tailscale.nix
+++ b/nixosModules/programs/tailscale.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options = {
-    settings.programs.tailscale.enable = lib.mkEnableOption "enable tailscale";
+  options.settings.programs.tailscale = {
+    enable = lib.mkEnableOption "enable tailscale";
   };
 
   config = lib.mkIf config.settings.programs.tailscale.enable {
diff --git a/nixosModules/services/fstrim.nix b/nixosModules/services/fstrim.nix
index c5df0c3..b3d018c 100644
--- a/nixosModules/services/fstrim.nix
+++ b/nixosModules/services/fstrim.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options = {
-    settings.services.fstrim.enable = lib.mkEnableOption "enables fstrim";
+  options.settings.services.fstrim = {
+    enable = lib.mkEnableOption "enables fstrim";
   };
 
   config = lib.mkIf config.settings.services.fstrim.enable {
diff --git a/nixosModules/services/gnome.nix b/nixosModules/services/gnome.nix
index c3900ad..0cb1358 100644
--- a/nixosModules/services/gnome.nix
+++ b/nixosModules/services/gnome.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }: {
-  options = {
-    settings.gnome.enable = lib.mkEnableOption "enable gnome de";
+  options.settings.gnome = {
+    enable = lib.mkEnableOption "enable gnome de";
   };
 
   #todo make this more configurable
diff --git a/nixosModules/services/locale.nix b/nixosModules/services/locale.nix
index c216ed7..35767bb 100644
--- a/nixosModules/services/locale.nix
+++ b/nixosModules/services/locale.nix
@@ -1,4 +1,9 @@
-{ ... }: {
+{ lib, ... }: {
+  /*options.settings.locale = {
+    enable = lib.mkEnableOption "enable locale config";
+    it = lib.mkEnableOption "use IT locale";
+  };*/
+
   time.timeZone = "Europe/Rome";
 
   i18n.defaultLocale = "en_US.UTF-8";
diff --git a/nixosModules/services/openssh.nix b/nixosModules/services/openssh.nix
index 95f8074..3de15b8 100644
--- a/nixosModules/services/openssh.nix
+++ b/nixosModules/services/openssh.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }: {
-  options.settings = {
-    services.openssh.enable = lib.mkEnableOption "enable openSSH";
-    services.openssh.usePAM = lib.mkEnableOption "use PAM for ssh authentication";
+  options.settings.services.openssh = {
+    enable = lib.mkEnableOption "enable openSSH";
+    usePAM = lib.mkEnableOption "use PAM for ssh authentication";
   };
 
 
diff --git a/nixosModules/services/pam.nix b/nixosModules/services/pam.nix
index a171029..90165b2 100644
--- a/nixosModules/services/pam.nix
+++ b/nixosModules/services/pam.nix
@@ -1,8 +1,10 @@
 { config, lib, ... }: {
-  options.settings = {
-    services.pam.enable = lib.mkEnableOption "enables PAM";
-    services.pam.sshd.useGoogleAuth = lib.mkEnableOption "use pam_google_authenticator.so module";
-    services.pam.sshd.gnupg = lib.mkEnableOption "enable gnuPG integration";
+  options.settings.services.pam = {
+    enable = lib.mkEnableOption "enables PAM";
+    sshd = {
+      useGoogleAuth = lib.mkEnableOption "use pam_google_authenticator.so module";
+      gnupg = lib.mkEnableOption "enable gnuPG integration";
+    };
   };
 
   config = lib.mkIf config.settings.services.pam.enable {
diff --git a/nixosModules/services/pipewire.nix b/nixosModules/services/pipewire.nix
index add8bd7..d850aed 100644
--- a/nixosModules/services/pipewire.nix
+++ b/nixosModules/services/pipewire.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options = {
-    settings.services.audio.enable = lib.mkEnableOption "enable sound through pipewire and its compat layers";
+  options.settings.services.audio = {
+    enable = lib.mkEnableOption "enable sound through pipewire and its compat layers";
   };
 
   config = lib.mkIf config.settings.services.audio.enable {
diff --git a/nixosModules/services/printing.nix b/nixosModules/services/printing.nix
index b2eab24..100983a 100644
--- a/nixosModules/services/printing.nix
+++ b/nixosModules/services/printing.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options = {
-    settings.services.printing.enable = lib.mkEnableOption "enable printing";
+  options.settings.services.printing = {
+    enable = lib.mkEnableOption "enable printing";
   };
 
   config = lib.mkIf config.settings.services.printing.enable {
diff --git a/nixosModules/services/switcheroo.nix b/nixosModules/services/switcheroo.nix
index b55b41c..ccd1884 100644
--- a/nixosModules/services/switcheroo.nix
+++ b/nixosModules/services/switcheroo.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options = {
-    settings.services.switcheroo.enable = lib.mkEnableOption "enable switcheroo-control for nvidia optimus management";
+  options.settings.services.switcheroo = {
+    enable = lib.mkEnableOption "enable switcheroo-control for nvidia optimus management";
   };
 
   config = lib.mkIf config.settings.services.switcheroo.enable {
diff --git a/nixosModules/services/tlp.nix b/nixosModules/services/tlp.nix
index 00131b0..c0c7ad3 100644
--- a/nixosModules/services/tlp.nix
+++ b/nixosModules/services/tlp.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options = {
-    settings.services.tlp.enable = lib.mkEnableOption "enables tlp for power management";
+  options.settings.services.tlp = {
+    enable = lib.mkEnableOption "enables tlp for power management";
   };
 
   config = lib.mkIf config.settings.services.tlp.enable {
diff --git a/nixosModules/users/fedfer.nix b/nixosModules/users/fedfer.nix
index 376947a..1665fd9 100644
--- a/nixosModules/users/fedfer.nix
+++ b/nixosModules/users/fedfer.nix
@@ -1,7 +1,7 @@
 #need to move stuff to home-manager
 { pkgs, config, lib, ... }: {
-  options.settings = {
-    users.fedfer.enable = lib.mkEnableOption "enables user FedFer";
+  options.settings.users.fedfer = {
+    enable = lib.mkEnableOption "enables user FedFer";
   };
 
   config = lib.mkIf config.settings.users.fedfer.enable {
diff --git a/nixosModules/users/veneficium.nix b/nixosModules/users/veneficium.nix
index 5a8e87d..70bce60 100644
--- a/nixosModules/users/veneficium.nix
+++ b/nixosModules/users/veneficium.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }: {
-  options.settings = {
-    users.veneficium.enable = lib.mkEnableOption "enables user Veneficium";
+  options.settings.users.veneficium = {
+    enable = lib.mkEnableOption "enables user Veneficium";
   };
 
   config = lib.mkIf config.settings.users.veneficium.enable {