Commit 6074e74

@@ -1,18 +0,0 @@
-{...}: {
-  programs.ghostty = {
-    enable = true;
-    enableBashIntegration = true;
-    enableFishIntegration = true;
-    settings = {
-      font-family = "Maple Mono NF CN";
-      command = "fish";
-      window-padding-x = 5;
-      window-padding-y = 5;
-      window-padding-balance = true;
-      window-height = 32;
-      window-width = 128;
-      window-new-tab-position = "current";
-      copy-on-select = false;
-    };
-  };
-}

@@ -1,11 +0,0 @@
-{config, ...}: let
-  configPath = "${config.home.homeDirectory}/nix-config/home/base/gui/terminals/wezterm/config";
-in {
-  xdg.configFile."wezterm".source = config.lib.file.mkOutOfStoreSymlink configPath;
-
-  catppuccin.wezterm.enable = false;
-
-  programs.wezterm = {
-    # enable = true;
-  };
-}

@@ -1,3 +0,0 @@
-{mylib, ...}: {
-  imports = mylib.scanModules ./.;
-}

@@ -0,0 +1,19 @@
+{
+  flake.modules.homeManager.terminal-ghostty = _: {
+    programs.ghostty = {
+      enable = true;
+      enableBashIntegration = true;
+      enableFishIntegration = true;
+      settings = {
+        command = "fish";
+        window-padding-x = 5;
+        window-padding-y = 5;
+        window-padding-balance = true;
+        window-height = 32;
+        window-width = 128;
+        window-new-tab-position = "current";
+        copy-on-select = false;
+      };
+    };
+  };
+}

@@ -0,0 +1,9 @@
+{
+  flake.modules.homeManager.terminal-wezterm = _: {
+    programs.wezterm = {
+      enable = true;
+    };
+    xdg.configFile."wezterm".source = ./config;
+    catppuccin.wezterm.enable = false;
+  };
+}

@@ -0,0 +1,24 @@
+{config, ...}: {
+  flake.modules.nixos.desktop = {pkgs, ...}: {
+    # add user's shell into /etc/shells
+    environment.shells = with pkgs; [
+      bashInteractive
+      fish
+      nushell
+    ];
+    # set user's default shell system-wide
+    users.defaultUserShell = pkgs.bashInteractive;
+
+    services.xserver.excludePackages = [pkgs.xterm];
+    environment.plasma6.excludePackages = [pkgs.kdePackages.konsole];
+
+    # fix for `sudo xxx` in kitty/wezterm/foot and other modern terminal emulators
+    security.sudo.keepTerminfo = true;
+  };
+  flake.modules.homeManager.desktop = _: {
+    imports = with config.flake.modules.homeManager; [
+      terminal-ghostty
+      # terminal-wezterm
+    ];
+  };
+}

@@ -1,21 +1,4 @@
-{
-  config,
-  pkgs,
-  myvars,
-  ...
-}: {
-  # add user's shell into /etc/shells
-  environment.shells = with pkgs; [
-    bashInteractive
-    fish
-    nushell
-  ];
-  # set user's default shell system-wide
-  users.defaultUserShell = pkgs.bashInteractive;
-
-  # fix for `sudo xxx` in kitty/wezterm/foot and other modern terminal emulators
-  security.sudo.keepTerminfo = true;
-
+{myvars, ...}: {
   services = {
     gvfs.enable = true; # Mount, trash, and other functionalities
     tumbler.enable = true; # Thumbnail support for images

@@ -16,9 +16,6 @@
     tumbler.enable = true; # Thumbnail support for images
     xserver = {
       xkb.layout = "us";
-      excludePackages = with pkgs; [
-        xterm
-      ];
     };
     displayManager = {
       autoLogin = {
@@ -29,7 +26,6 @@
   };
 
   environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    konsole
     kdepim-runtime
     kate
     elisa