restructured and optimized content

home/core.nix

@@ -1,7 +1,7 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
 
-{ inputs, outputs, lib, config, pkgs, username, useremail, ... }: {
+{ inputs, outputs, lib, config, pkgs, username, useremail, sysversion, ... }: {
 
   home = {
     inherit username;
@@ -13,11 +13,8 @@
     ];
   };
 
-  # Enable home-manager and git
+  # Enable git
   programs = {
-    # home-manager.enable = true;
-    # git.enable = true;
-
     git = {
       enable = true;
 
@@ -60,6 +57,25 @@
       shellAliases = { };
     };
 
+    zsh = {
+      enable = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+
+      shellAliases = {
+        la = "ls -la";
+        ll = "ls -l";
+        edit = "sudo -e";
+        update = "sudo nixos-rebuild switch";
+      };
+
+      history.size = 10000;
+      history.ignoreAllDups = true;
+      history.path = "$HOME/.zsh_history";
+      history.ignorePatterns = ["rm *" "pkill *" "cp *"];
+    };
+
     vim = {
       enable = true;
       plugins = with pkgs.vimPlugins; [ vim-airline ];
@@ -106,5 +122,5 @@
   systemd.user.startServices = "sd-switch";
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "23.05";
+  home.stateVersion = sysversion;
 }

home/desktop.nix

@@ -12,13 +12,12 @@
     # inputs.nix-colors.homeManagerModules.default
 
     # You can also split up your configuration and import pieces of it here:
-    # ./nvim.nix
     ./core.nix
     ../modules/home/hyprland
     ../modules/home/vscode
-    ../modules/home/v2ray
     ../modules/home/xdg.nix
     ../modules/home/theme.nix
+    ../modules/home/fcitx.nix
   ];
 
   home = {
@@ -27,58 +26,24 @@
       bc # GNU software calculator
       vlc
       imv
-      motrix
       microsoft-edge
-      telegram-desktop
       # firefox
       # chromium
 
       zip
       unzip
       lsof
+      htop
       pciutils # lspci etc.
-      steam-run
-      frp
-      obsidian
-      wpsoffice-cn
       xorg.xhost
-
-      dbeaver
-      postman
-      # jdk
-      nodejs
-      yarn
-      flutter
-      oraclejdk
-      jetbrains.idea-community
-      # nur.repos.linyinfeng.wemeet
     ];
 
     sessionVariables = {
-      JAVA_HOME = "${pkgs.oraclejdk}";
-      XIM = "fcitx";
-      XIM_PROGRAM = "fcitx";
-      XMODIFIERS = "@im=fcitx";
-    };
-  };
-
-  programs = {
-    bash = {
-      initExtra = ''
-        export XIM="fcitx"
-        export XIM_PROGRAM="fcitx"
-        export XMODIFIERS="@im=fcitx"
-      '';
+      JAVA_HOME = "";
     };
   };
 
 
-  i18n.inputMethod = {
-    enabled = "fcitx5";
-    fcitx5.addons = with pkgs; [
-      fcitx5-chinese-addons
-    ];
-  };
 
   # Enable home-manager and git
   programs = {