diff --git a/hosts/nixos/deck/home.nix b/hosts/nixos/deck/home.nix
index f373684..70b8518 100644
--- a/hosts/nixos/deck/home.nix
+++ b/hosts/nixos/deck/home.nix
@@ -10,11 +10,11 @@
     ../../../modules/syncthing.nix
     ../../../modules/firefox.nix
     ../../../modules/ghostty.nix
-    ../../../modules/gnome.nix
+    ../../../modules/gnome/home.nix
   ];
 
   # Always show GNOME top bar on Steam Deck
-  gnome-custom.alwaysShowTopBar = true;
+  gnome-home-custom.alwaysShowTopBar = true;
 
   # Disable Documents sync on Steam Deck (save space)
   syncthing-custom.enabledFolders = [ "Credentials" "Obsidian" ];
diff --git a/hosts/nixos/deck/system.nix b/hosts/nixos/deck/system.nix
index cf825db..2d77db9 100644
--- a/hosts/nixos/deck/system.nix
+++ b/hosts/nixos/deck/system.nix
@@ -5,13 +5,13 @@
     ./hardware-configuration.nix
     ./disk-config.nix
     ../system-default.nix  # Common NixOS system configuration
-    ../../../modules/desktop.nix
+    ../../../modules/gnome/system.nix
     ../../../modules/wireguard.nix
     ../../../modules/login-display.nix
   ];
 
   # Desktop module configuration (disable GDM for Jovian autoStart mode)
-  desktop-custom.enableDisplayManager = false;
+  gnome-system-custom.enableDisplayManager = false;
 
   # Bootloader - standard UEFI setup
   boot.loader = {
diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix
index 7117095..4b744a1 100644
--- a/hosts/nixos/thinkpad/home.nix
+++ b/hosts/nixos/thinkpad/home.nix
@@ -9,7 +9,7 @@
     ../home-default.nix
     ../../../modules/syncthing.nix
     ../../../modules/tex.nix
-    ../../../modules/gnome.nix
+    ../../../modules/gnome/home.nix
     ../../../modules/firefox.nix
     ../../../modules/ghostty.nix
     ../../../modules/papis.nix
diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index 062f290..ec3375e 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -4,7 +4,7 @@
   imports = [
     ./hardware-configuration.nix
     ../system-default.nix  # Common NixOS system configuration
-    ../../../modules/desktop.nix
+    ../../../modules/gnome/system.nix
     ../../../modules/wireguard.nix
     ../../../modules/login-display.nix
     ../../../modules/keyboard-toggle.nix
diff --git a/modules/gnome.nix b/modules/gnome/home.nix
similarity index 97%
rename from modules/gnome.nix
rename to modules/gnome/home.nix
index 6b4f9fc..928103b 100644
--- a/modules/gnome.nix
+++ b/modules/gnome/home.nix
@@ -1,14 +1,14 @@
 { config, pkgs, lib, ... }:
 
 let
-  cfg = config.gnome-custom;
+  cfg = config.gnome-home-custom;
   # Import gvariant helpers for dconf types
   mkTuple = lib.hm.gvariant.mkTuple;
   mkUint32 = lib.hm.gvariant.mkUint32;
 in
 
 {
-  options.gnome-custom = {
+  options.gnome-home-custom = {
     alwaysShowTopBar = lib.mkOption {
       type = lib.types.bool;
       default = false;
@@ -123,11 +123,6 @@ in
       tile-bottomleft-quarter = [ "<Super>f" ];   # Bottom-left: Super+F
       tile-bottomright-quarter = [ "<Super>g" ];  # Bottom-right: Super+G
     };
-
-    # NOTE: vim-style hjkl keybindings (Super+h/j/k/l) are configured at the
-    # system level in desktop.nix with lockAll = true to prevent them from
-    # being overridden after suspend/resume or by GNOME extensions
-
   };
 
   # IBus Mozc (Japanese) configuration - default to Hiragana input mode
diff --git a/modules/desktop.nix b/modules/gnome/system.nix
similarity index 98%
rename from modules/desktop.nix
rename to modules/gnome/system.nix
index c1e7181..8b9ac35 100644
--- a/modules/desktop.nix
+++ b/modules/gnome/system.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  cfg = config.desktop-custom;
+  cfg = config.gnome-system-custom;
   # Import gvariant for dconf types
   mkTuple = lib.gvariant.mkTuple;
   mkUint32 = lib.gvariant.mkUint32;
@@ -11,7 +11,7 @@ let
 in
 
 {
-  options.desktop-custom = {
+  options.gnome-system-custom = {
     enableDisplayManager = mkOption {
       type = types.bool;
       default = true;