rearrange DE modules

hosts/nixos/deck/system.nix

@@ -43,31 +43,6 @@
     };
   };
 
-  # Input method configuration
-  i18n.inputMethod = {
-    enable = true;
-    type = "ibus";
-    ibus.engines = with pkgs.ibus-engines; [
-      libpinyin  # Chinese Simplified Pinyin
-      mozc       # Japanese (Romaji)
-    ];
-  };
-
-  # GNOME settings (prevent suspend, enable virtual keyboard)
-  programs.dconf.profiles.user.databases = [{
-    settings = {
-      "org/gnome/settings-daemon/plugins/power" = {
-        sleep-inactive-ac-type = "nothing";
-      };
-      "org/gnome/desktop/a11y/applications" = {
-        screen-keyboard-enabled = true;
-      };
-      "org/gnome/desktop/peripherals/mouse" = {
-        accel-profile = "flat";
-      };
-    };
-  }];
-
   # Hardware support for Steam Deck (AMD APU)
   hardware = {
     enableRedistributableFirmware = true;

hosts/nixos/thinkpad/home.nix

@@ -55,7 +55,5 @@
       '';
     })
     remmina
-    evince
-    loupe
   ];
 }

modules/gnome/system.nix

@@ -80,6 +80,31 @@ in
       };
     };
 
+    # Input method configuration for GNOME
+    i18n.inputMethod = {
+      enable = true;
+      type = "ibus";
+      ibus.engines = with pkgs.ibus-engines; [
+        libpinyin  # Chinese Simplified Pinyin
+        mozc       # Japanese (Romaji)
+      ];
+    };
+
+    # GNOME dconf settings
+    programs.dconf.profiles.user.databases = [{
+      settings = {
+        "org/gnome/settings-daemon/plugins/power" = {
+          sleep-inactive-ac-type = "nothing";
+        };
+        "org/gnome/desktop/a11y/applications" = {
+          screen-keyboard-enabled = true;
+        };
+        "org/gnome/desktop/peripherals/mouse" = {
+          accel-profile = "flat";
+        };
+      };
+    }];
+
     # System packages for GNOME
     environment.systemPackages = with pkgs; [
       hicolor-icon-theme  # Fallback icon theme

modules/hyprland/home.nix

@@ -387,6 +387,8 @@
     adwaita-qt6
     grimblast
     xfce.thunar
+    evince
+    loupe
   ];
 
   # Hyprland-specific shell configuration

modules/hyprland/system.nix

@@ -1,6 +1,21 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.hyprland-system-custom;
+in
 
 {
+  options.hyprland-system-custom = {
+    enableDisplayManager = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Enable greetd display manager (conflicts with jovian.steam.autoStart)";
+    };
+  };
+
+  config = {
     # Enable Hyprland
     programs.hyprland = {
       enable = true;
@@ -8,7 +23,7 @@
     };
 
     # Display manager: greetd + tuigreet
-  services.greetd = {
+    services.greetd = mkIf cfg.enableDisplayManager {
       enable = true;
       settings = {
         default_session = {
@@ -40,7 +55,7 @@
 
     # GNOME Keyring with PAM integration for WiFi password storage
     services.gnome.gnome-keyring.enable = true;
-  security.pam.services.greetd.enableGnomeKeyring = true;
+    security.pam.services.greetd.enableGnomeKeyring = mkIf cfg.enableDisplayManager true;
 
     # Input method configuration for Hyprland
     i18n.inputMethod = {
@@ -67,4 +82,5 @@
       nwg-displays
       swaynotificationcenter
     ];
+  };
 }