diff --git a/modules/base/home.nix b/modules/base/home.nix
index d734ee3..6ea371c 100644
--- a/modules/base/home.nix
+++ b/modules/base/home.nix
@@ -6,18 +6,20 @@
     email = "marley@punkfairie.net";
   };
 in {
-  marleycfg.my = my;
+  config = {
+    marleycfg.my = my;
 
-  home-manager = {
-    useUserPackages = true;
-    useGlobalPkgs = true;
-    backupFileExtension = "bak";
+    home-manager = {
+      useUserPackages = true;
+      useGlobalPkgs = true;
+      backupFileExtension = "bak";
 
-    users."${my.name}" = {
-      home.username = my.name;
+      users."${my.name}" = {
+        home.username = my.name;
+      };
+
+      sharedModules = [../home];
+      extraSpecialArgs = {inherit marleylib;};
     };
-
-    sharedModules = [../home];
-    extraSpecialArgs = {inherit marleylib;};
   };
 }
diff --git a/modules/base/stylix/default.nix b/modules/base/stylix/default.nix
index 46a7cb3..8c294f1 100644
--- a/modules/base/stylix/default.nix
+++ b/modules/base/stylix/default.nix
@@ -1,20 +1,22 @@
 {pkgs, ...}: {
-  stylix = {
-    enable = true;
+  config = {
+    stylix = {
+      enable = true;
 
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
-    override = {slug = "rose-pine";};
+      base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml";
+      override = {slug = "rose-pine";};
 
-    image = ./wallpaper.png;
+      image = ./wallpaper.png;
 
-    fonts = {
-      monospace = {
-        package = pkgs.maple-mono-NF;
-        name = "Maple Mono";
-      };
+      fonts = {
+        monospace = {
+          package = pkgs.maple-mono-NF;
+          name = "Maple Mono";
+        };
 
-      sizes = {
-        terminal = 11;
+        sizes = {
+          terminal = 11;
+        };
       };
     };
   };
diff --git a/modules/darwin/system/nix.nix b/modules/darwin/system/nix.nix
index 335aa2e..af5ec75 100644
--- a/modules/darwin/system/nix.nix
+++ b/modules/darwin/system/nix.nix
@@ -1,9 +1,11 @@
 {
-  nix = {
-    settings = {
-      trusted-users = [
-        "@darwin"
-      ];
+  config = {
+    nix = {
+      settings = {
+        trusted-users = [
+          "@darwin"
+        ];
+      };
     };
   };
 }
diff --git a/modules/home/home-manager.nix b/modules/home/home-manager.nix
index 11c724e..58b33fa 100644
--- a/modules/home/home-manager.nix
+++ b/modules/home/home-manager.nix
@@ -1,8 +1,10 @@
 {
-  programs.home-manager.enable = true;
+  config = {
+    programs.home-manager.enable = true;
 
-  home.language.base = "en_US.UTF-8";
+    home.language.base = "en_US.UTF-8";
 
-  # Autostart wanted systemd services on Linux.
-  systemd.user.startServices = true;
+    # Autostart wanted systemd services on Linux.
+    systemd.user.startServices = true;
+  };
 }
diff --git a/modules/home/option-inheritance.nix b/modules/home/option-inheritance.nix
index b23df85..d665a40 100644
--- a/modules/home/option-inheritance.nix
+++ b/modules/home/option-inheritance.nix
@@ -1,13 +1,15 @@
 {osConfig, ...}: let
   cfg = osConfig.marleycfg;
 in {
-  marleycfg = {
-    profiles = {
-      inherit (cfg.profiles) desktop server;
-    };
+  config = {
+    marleycfg = {
+      profiles = {
+        inherit (cfg.profiles) desktop server;
+      };
 
-    my = {
-      inherit (cfg.my) name fullName username email git;
+      my = {
+        inherit (cfg.my) name fullName username email git;
+      };
     };
   };
 }
diff --git a/modules/nixos/hardware/mounts/automounts.nix b/modules/nixos/hardware/mounts/automounts.nix
index a922b2d..c56e742 100644
--- a/modules/nixos/hardware/mounts/automounts.nix
+++ b/modules/nixos/hardware/mounts/automounts.nix
@@ -1,7 +1,9 @@
 {
-  boot.supportedFilesystems = {
-    ntfs = true;
-  };
+  config = {
+    boot.supportedFilesystems = {
+      ntfs = true;
+    };
 
-  services.udisks2.enable = true;
+    services.udisks2.enable = true;
+  };
 }
diff --git a/modules/nixos/shell/fonts.nix b/modules/nixos/shell/fonts.nix
index bae9b4d..44f6baf 100644
--- a/modules/nixos/shell/fonts.nix
+++ b/modules/nixos/shell/fonts.nix
@@ -1,10 +1,12 @@
 {pkgs, ...}: {
-  fonts = {
-    enableDefaultPackages = true;
+  config = {
+    fonts = {
+      enableDefaultPackages = true;
 
-    packages = with pkgs; [
-      corefonts
-      noto-fonts
-    ];
+      packages = with pkgs; [
+        corefonts
+        noto-fonts
+      ];
+    };
   };
 }
diff --git a/modules/nixos/system/boot.nix b/modules/nixos/system/boot.nix
index a602e0d..74dced6 100644
--- a/modules/nixos/system/boot.nix
+++ b/modules/nixos/system/boot.nix
@@ -4,14 +4,16 @@
   config,
   ...
 }: {
-  boot = {
-    kernelPackages =
-      lib.mkIf (!config.marleycfg.profiles.server)
-      pkgs.linuxPackages_xanmod;
+  config = {
+    boot = {
+      kernelPackages =
+        lib.mkIf (!config.marleycfg.profiles.server)
+        pkgs.linuxPackages_xanmod;
 
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
+      loader = {
+        systemd-boot.enable = true;
+        efi.canTouchEfiVariables = true;
+      };
     };
   };
 }
diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix
index 27d5e54..cdcc265 100644
--- a/modules/nixos/system/i18n.nix
+++ b/modules/nixos/system/i18n.nix
@@ -1,15 +1,17 @@
 {config, ...}: {
-  time.timeZone =
-    if config.marleycfg.profiles.server
-    then "UTC"
-    else "America/Los_Angeles";
+  config = {
+    time.timeZone =
+      if config.marleycfg.profiles.server
+      then "UTC"
+      else "America/Los_Angeles";
 
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
+    i18n = {
+      defaultLocale = "en_US.UTF-8";
 
-    extraLocaleSettings = {
-      LC_MESSAGES = "en_US.UTF-8";
-      LC_TIME = "de_DE.UTF-8";
+      extraLocaleSettings = {
+        LC_MESSAGES = "en_US.UTF-8";
+        LC_TIME = "de_DE.UTF-8";
+      };
     };
   };
 }
diff --git a/modules/nixos/system/networking.nix b/modules/nixos/system/networking.nix
index 0da2ef4..3cc4cb6 100644
--- a/modules/nixos/system/networking.nix
+++ b/modules/nixos/system/networking.nix
@@ -3,14 +3,16 @@
   config,
   ...
 }: {
-  networking = {
-    networkmanager.enable = true;
+  config = {
+    networking = {
+      networkmanager.enable = true;
 
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [80 443];
+      firewall = {
+        enable = true;
+        allowedTCPPorts = [80 443];
+      };
+
+      wireless.enable = lib.mkIf config.marleycfg.profiles.server false;
     };
-
-    wireless.enable = lib.mkIf config.marleycfg.profiles.server false;
   };
 }
diff --git a/modules/nixos/system/nix.nix b/modules/nixos/system/nix.nix
index 490a284..33637c1 100644
--- a/modules/nixos/system/nix.nix
+++ b/modules/nixos/system/nix.nix
@@ -1,9 +1,11 @@
 {
-  nix = {
-    settings = {
-      trusted-users = [
-        "@wheel"
-      ];
+  config = {
+    nix = {
+      settings = {
+        trusted-users = [
+          "@wheel"
+        ];
+      };
     };
   };
 }