From 0f5fc737e4e1efcee563eb65f619eac65e34a5f9 Mon Sep 17 00:00:00 2001
From: Alexander <alexander0derevianko@gmail.com>
Date: Sun, 10 Aug 2025 12:29:19 +0200
Subject: [PATCH] Add java and development aliases

---
 hm-modules/development/default.nix                       | 3 ++-
 machines/fujin/main/default.nix                          | 4 ++++
 .../fujin/main/dotfiles/.config/Code/User/settings.json  | 9 ++++++++-
 machines/fujin/main/dotfiles/.config/doom/config.el      | 6 ++++++
 machines/fujin/main/dotfiles/.config/doom/packages.el    | 6 ++++++
 modules/development/emacs/default.nix                    | 4 ++--
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/hm-modules/development/default.nix b/hm-modules/development/default.nix
index 2b5f2d6..7f082e7 100644
--- a/hm-modules/development/default.nix
+++ b/hm-modules/development/default.nix
@@ -17,6 +17,7 @@ in {
     home.packages = with pkgs; [
       maven
       nodejs_22
+      jdk21
     ];
 
     home.file."jdk/openjdk11".source = pkgs.jdk11;
@@ -32,7 +33,7 @@ in {
       };
 
       nu = {
-        shellAliases = aliases;
+        #shellAliases = aliases;
       };
     };
   };
diff --git a/machines/fujin/main/default.nix b/machines/fujin/main/default.nix
index ef13a34..19d07a3 100644
--- a/machines/fujin/main/default.nix
+++ b/machines/fujin/main/default.nix
@@ -20,6 +20,8 @@
       # Stow, to manage my doom emacs configs
       stow
     ];
+
+    shell = lib.mkDefault pkgs.nushell;
   };
 
   programs = {
@@ -57,6 +59,8 @@
   ###
   ###
 
+  services.tailscale.enable = true;
+
   dov = {
     development.emacs.enable = true;
 
diff --git a/machines/fujin/main/dotfiles/.config/Code/User/settings.json b/machines/fujin/main/dotfiles/.config/Code/User/settings.json
index 46633e0..33873b4 100644
--- a/machines/fujin/main/dotfiles/.config/Code/User/settings.json
+++ b/machines/fujin/main/dotfiles/.config/Code/User/settings.json
@@ -17,5 +17,12 @@
   "workbench.colorTheme": "Stylix",
   "redhat.telemetry.enabled": true,
   "database-client.autoSync": true,
-  "git.confirmSync": false
+  "git.confirmSync": false,
+  "java.configuration.runtimes": [
+    {
+      "name": "JavaSE-21",
+      "path": "/home/fujin/jdk/openjdk21",
+      "default": true,
+    },
+  ]
 }
diff --git a/machines/fujin/main/dotfiles/.config/doom/config.el b/machines/fujin/main/dotfiles/.config/doom/config.el
index e04fd60..458c906 100644
--- a/machines/fujin/main/dotfiles/.config/doom/config.el
+++ b/machines/fujin/main/dotfiles/.config/doom/config.el
@@ -243,3 +243,9 @@
   :hook (nix-mode . lsp-deferred)
   :ensure t)
   )
+
+(after! claude-code-ide
+  (use-package claude-code-ide
+    :bind ("C-c C-'" . claude-code-ide-menu) ; Set your favorite keybinding
+    :config
+    (claude-code-ide-emacs-tools-setup))) ; Optionally enable Emacs MCP tools
diff --git a/machines/fujin/main/dotfiles/.config/doom/packages.el b/machines/fujin/main/dotfiles/.config/doom/packages.el
index b226163..73ba953 100644
--- a/machines/fujin/main/dotfiles/.config/doom/packages.el
+++ b/machines/fujin/main/dotfiles/.config/doom/packages.el
@@ -50,3 +50,9 @@
 ;(unpin! t)
 
 ;;(package! mu4e :pin "b36e492")
+
+(package! claude-code-ide
+  :recipe (:type git :host github :repo "manzaltu/claude-code-ide.el"))
+(package! web-server)
+
+(package! just-mode)
diff --git a/modules/development/emacs/default.nix b/modules/development/emacs/default.nix
index 5eb1e22..da8387a 100644
--- a/modules/development/emacs/default.nix
+++ b/modules/development/emacs/default.nix
@@ -14,7 +14,6 @@ in {
     ];
 
     users.users."${username}" = {
-
       packages = with pkgs; [
         ## Emacs itself
         binutils # native-comp needs 'as', provided by this
@@ -72,8 +71,9 @@ in {
 
         isync # mu4e related
       ];
-
     };
+
+    services.lorri.enable = true; # will cache nix builds and speed up direnv tremendously:
   };
 
 }