diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index ef99cc5..ab3c8ab 100755
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -1,5 +1,7 @@
 {
-  shell = import ./services/shell.nix;
-  gnome = import ./services/gnome.nix;
-  zed = import ./submodules/zed.nix;
+  imports = [
+    ./services/shell.nix
+    ./services/gnome.nix
+    ./submodules/zed.nix
+  ];
 }
diff --git a/modules/apps/services/gnome.nix b/modules/apps/services/gnome.nix
index 0c4d407..d0670f6 100644
--- a/modules/apps/services/gnome.nix
+++ b/modules/apps/services/gnome.nix
@@ -1,4 +1,6 @@
 {
-  shell = import ../submodules/gnome-shell.nix;
-  apps = import ../submodules/gnome-apps.nix;
+  imports = [
+    ../submodules/gnome-shell.nix
+    ../submodules/gnome-apps.nix
+  ];
 }
diff --git a/modules/apps/services/shell.nix b/modules/apps/services/shell.nix
index ab8acd9..f2ff46e 100644
--- a/modules/apps/services/shell.nix
+++ b/modules/apps/services/shell.nix
@@ -1,6 +1,8 @@
 {
-  zsh = import ../submodules/zsh.nix;
-  nh = import ../submodules/nh.nix;
-  git = import ../submodules/git.nix;
-  docker = import ../submodules/docker.nix;
+  imports = [
+    ../submodules/zsh.nix
+    ../submodules/nh.nix
+    ../submodules/git.nix
+    ../submodules/docker.nix
+  ];
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 54fde2e..862b1ad 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,7 +1,9 @@
 {
-  boot = import ./services/boot.nix;
-  graphics = import ./services/graphics.nix;
-  networks = import ./services/networks.nix;
-  audio = import ./services/audio.nix;
-  keyboard = import ./services/keyboard.nix;
+  imports = [
+    ./services/boot.nix
+    ./services/graphics.nix
+    ./services/networks.nix
+    ./services/audio.nix
+    ./services/keyboard.nix
+  ];
 }
diff --git a/modules/nixos/services/audio.nix b/modules/nixos/services/audio.nix
index c2676e1..ae1dbf0 100644
--- a/modules/nixos/services/audio.nix
+++ b/modules/nixos/services/audio.nix
@@ -1,3 +1,3 @@
 {
-  pipewire = import ../submodules/pipewire.nix;
+  imports = [ ../submodules/pipewire.nix ];
 }
diff --git a/modules/nixos/services/boot.nix b/modules/nixos/services/boot.nix
index 69ed3a3..646f588 100644
--- a/modules/nixos/services/boot.nix
+++ b/modules/nixos/services/boot.nix
@@ -1,4 +1,6 @@
 {
-  systemd = import ../submodules/systemd-boot.nix;
-  plymouth = import ../submodules/plymouth.nix;
+  imports = [
+    ../submodules/systemd-boot.nix
+    ../submodules/plymouth.nix
+  ];
 }
diff --git a/modules/nixos/services/graphics.nix b/modules/nixos/services/graphics.nix
index c20ff3a..55ab307 100644
--- a/modules/nixos/services/graphics.nix
+++ b/modules/nixos/services/graphics.nix
@@ -1,6 +1,6 @@
 {
-  nvidia = {
-    base = import ../submodules/nvidia.nix;
-    prime = import ../submodules/nvidia-prime.nix;
-  };
+  imports = [
+    ../submodules/nvidia.nix
+    ../submodules/nvidia-prime.nix
+  ];
 }
diff --git a/modules/nixos/services/keyboard.nix b/modules/nixos/services/keyboard.nix
index 941f4da..94f316c 100644
--- a/modules/nixos/services/keyboard.nix
+++ b/modules/nixos/services/keyboard.nix
@@ -1,3 +1,3 @@
 {
-  apple = import ../submodules/keyboard-apple.nix;
+  imports = [ ../submodules/keyboard-apple.nix ];
 }
diff --git a/modules/nixos/services/networks.nix b/modules/nixos/services/networks.nix
index e8bcc24..5a2cb43 100755
--- a/modules/nixos/services/networks.nix
+++ b/modules/nixos/services/networks.nix
@@ -1,4 +1,6 @@
 {
-  dns = import ../submodules/dns.nix;
-  manager = import ../submodules/manager.nix;
+  imports = [
+    ../submodules/dns.nix
+    ../submodules/manager.nix
+  ];
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ea1c4ae..4d67c34 100755
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -18,6 +18,7 @@
 
     # Modules
     inputs.self.nixos
+    inputs.self.apps
 
   ];
 
@@ -59,6 +60,15 @@
   # System configurations
   within.keyboard.apple.enable = true;
 
+  # Shell configurations
+  within.shell.zsh.enable = true;
+  within.shell.git.enable = true;
+  within.shell.nh.enable = true;
+
+  # Gnome configurations
+  within.gnome.shell.enable = true;
+  within.gnome.apps.enable = true;
+
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "25.11";
 }