From 82aa68744f4c5de2aa3bc286050d90c8d1925c24 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 5 Oct 2025 17:34:20 -0700
Subject: [PATCH] jj update and corrections for github copilot lsp

---
 home.nix                       |  2 +-
 programs/jujutsu/default.nix   | 20 ++++++++++++++++++--
 programs/nixvim/completion.nix |  2 ++
 programs/nixvim/plugins/ai.nix | 18 ++++++++++++------
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/home.nix b/home.nix
index 99dba20..465616e 100644
--- a/home.nix
+++ b/home.nix
@@ -73,7 +73,7 @@
       nix-index
       nixfmt-rfc-style
       nix-prefetch-git
-      nodejs
+      nodejs-slim
       noto-fonts
       noto-fonts-color-emoji
       ollama
diff --git a/programs/jujutsu/default.nix b/programs/jujutsu/default.nix
index a8d885a..6f0ebb9 100644
--- a/programs/jujutsu/default.nix
+++ b/programs/jujutsu/default.nix
@@ -4,7 +4,16 @@ let
     l = [
       "log"
       "-r"
-      "(main@origin..@):: | (main@origin..@)-"
+      "ancestors(reachable(@, mutable()), 2)"
+    ];
+    n = [ "new" ];
+    tug = [
+      "bookmark"
+      "move"
+      "--from"
+      "closest_bookmark(@-)"
+      "--to"
+      "@-"
     ];
   };
 in
@@ -13,11 +22,18 @@ in
     enable = true;
     settings = {
       aliases = MyAliases;
+      gerrit.enabled = false;
+      git = {
+        subprocess = true;
+      };
       signing = {
         key = "~/.ssh/id_ed25519.pub";
       };
+      templates = {
+        git_push_bookmark = "'\"softinio/push-\" ++ change_id.short()'";
+      };
       ui = {
-        default-command = "log";
+        default-command = "l";
         diff-formatter = [
           "difft"
           "--color=always"
diff --git a/programs/nixvim/completion.nix b/programs/nixvim/completion.nix
index 27e88a6..3a82179 100644
--- a/programs/nixvim/completion.nix
+++ b/programs/nixvim/completion.nix
@@ -30,6 +30,7 @@
             enable = true;
             menu = {
               nvim_lsp = "[LSP]";
+              copilot-vim = "[copilot]";
               luasnip = "[snip]";
               buffer = "[buffer]";
               path = "[path]";
@@ -67,6 +68,7 @@
 
           sources = [
             { name = "nvim_lsp"; }
+            { name = "copilot-vim"; }
             { name = "luasnip"; }
             {
               name = "buffer";
diff --git a/programs/nixvim/plugins/ai.nix b/programs/nixvim/plugins/ai.nix
index ad9c454..b887537 100644
--- a/programs/nixvim/plugins/ai.nix
+++ b/programs/nixvim/plugins/ai.nix
@@ -1,11 +1,17 @@
-{ ... }:
+{ pkgs, lib, ... }:
 
 {
-  programs.nixvim.plugins = {
-    # GitHub Copilot
-    copilot-vim.enable = true;
+  programs.nixvim = {
+    plugins = {
+      # GitHub Copilot
+      copilot-vim.enable = true;
 
-    # Avante AI assistant (imported from separate file)
-    # avante config is in avante.nix
+      # Avante AI assistant (imported from separate file)
+      # avante config is in avante.nix
+    };
+
+    globals = {
+      copilot_node_command = lib.mkForce "${pkgs.nodejs-slim}/bin/node";
+    };
   };
 }
\ No newline at end of file