jj update and corrections for github copilot lsp

This commit is contained in:
Salar Rahmanian 2025-10-05 17:34:20 -07:00
parent 6b37f9ec83
commit 82aa68744f
4 changed files with 33 additions and 9 deletions

View file

@ -73,7 +73,7 @@
nix-index nix-index
nixfmt-rfc-style nixfmt-rfc-style
nix-prefetch-git nix-prefetch-git
nodejs nodejs-slim
noto-fonts noto-fonts
noto-fonts-color-emoji noto-fonts-color-emoji
ollama ollama

View file

@ -4,7 +4,16 @@ let
l = [ l = [
"log" "log"
"-r" "-r"
"(main@origin..@):: | (main@origin..@)-" "ancestors(reachable(@, mutable()), 2)"
];
n = [ "new" ];
tug = [
"bookmark"
"move"
"--from"
"closest_bookmark(@-)"
"--to"
"@-"
]; ];
}; };
in in
@ -13,11 +22,18 @@ in
enable = true; enable = true;
settings = { settings = {
aliases = MyAliases; aliases = MyAliases;
gerrit.enabled = false;
git = {
subprocess = true;
};
signing = { signing = {
key = "~/.ssh/id_ed25519.pub"; key = "~/.ssh/id_ed25519.pub";
}; };
templates = {
git_push_bookmark = "'\"softinio/push-\" ++ change_id.short()'";
};
ui = { ui = {
default-command = "log"; default-command = "l";
diff-formatter = [ diff-formatter = [
"difft" "difft"
"--color=always" "--color=always"

View file

@ -30,6 +30,7 @@
enable = true; enable = true;
menu = { menu = {
nvim_lsp = "[LSP]"; nvim_lsp = "[LSP]";
copilot-vim = "[copilot]";
luasnip = "[snip]"; luasnip = "[snip]";
buffer = "[buffer]"; buffer = "[buffer]";
path = "[path]"; path = "[path]";
@ -67,6 +68,7 @@
sources = [ sources = [
{ name = "nvim_lsp"; } { name = "nvim_lsp"; }
{ name = "copilot-vim"; }
{ name = "luasnip"; } { name = "luasnip"; }
{ {
name = "buffer"; name = "buffer";

View file

@ -1,11 +1,17 @@
{ ... }: { pkgs, lib, ... }:
{ {
programs.nixvim.plugins = { programs.nixvim = {
# GitHub Copilot plugins = {
copilot-vim.enable = true; # GitHub Copilot
copilot-vim.enable = true;
# Avante AI assistant (imported from separate file) # Avante AI assistant (imported from separate file)
# avante config is in avante.nix # avante config is in avante.nix
};
globals = {
copilot_node_command = lib.mkForce "${pkgs.nodejs-slim}/bin/node";
};
}; };
} }