diff --git a/modules/home/core/apps.nix b/modules/home/core/apps.nix
index bea3f99..b16ec7e 100644
--- a/modules/home/core/apps.nix
+++ b/modules/home/core/apps.nix
@@ -1,13 +1,7 @@
 { pkgs, ... }: {
   nixpkgs.config.allowUnfree = true;
 
-  home = {
-    sessionVariables = {
-      EDITOR = "nvim";
-      BROWSER = "brave";
-      TERMINAL = "kitty";
-    };
-    packages = with pkgs; [
+  home.packages = with pkgs; [
       vscode # lets see how long you survive as my default code editor
       zed-editor
 
@@ -40,18 +34,5 @@
       portablemc
       ferium
       virt-manager
-
-      # CLI tools moved to core/cli.nix
-      go
-      bun
-      #nodejs # pkgs.buildEnv error: two given paths contain a conflicting subpath
-      nodePackages.npm
-      nodePackages.pnpm
-      nodePackages.yarn
-      python314
-      jdk25_headless
-      arduino-cli
-      esptool
     ];
-  };
 }
diff --git a/modules/home/core/cli.nix b/modules/home/core/cli.nix
index d0a8b9b..6dc7b7c 100644
--- a/modules/home/core/cli.nix
+++ b/modules/home/core/cli.nix
@@ -1,4 +1,22 @@
 { pkgs, git, rice, ... }: {
+  home.sessionVariables = {
+    EDITOR = "nvim";
+    BROWSER = "brave";
+    TERMINAL = "kitty";
+  };
+
+  home.packages = with pkgs; [
+    go
+    bun
+    # nodejs # pkgs.buildEnv error: two given paths contain a conflicting subpath
+    nodePackages.npm
+    nodePackages.pnpm
+    nodePackages.yarn
+    python314
+    arduino-cli
+    esptool
+  ];
+
   programs = {
     tmux.enable = true;
     vim.enable = true;