chore: use helix from nixpkgs, remove helix copilot fork, use lsp-ai

johnae · Sep 8, 2024 · 5e1bf08 · 5e1bf08
1 parent ff00185
commit 5e1bf08
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 66 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -53,11 +53,6 @@
     flake-utils.inputs.systems.follows = "systems";
     fluxcd-install.flake = false;
     fluxcd-install.url = "https://github.com/fluxcd/flux2/releases/download/v2.3.0/install.yaml"; # gh-release-update
-    helix.inputs.crane.follows = "crane";
-    helix.inputs.flake-utils.follows = "flake-utils";
-    helix.inputs.nixpkgs.follows = "nixpkgs";
-    helix.inputs.rust-overlay.follows = "rust-overlay";
-    helix.url = "github:AlexanderDickie/helix/copilot"; ## copilot support
     hetzner-csi-driver.flake = false;
     hetzner-csi-driver.url = "https://raw.githubusercontent.com/hetznercloud/csi-driver/v2.9.0/deploy/kubernetes/hcloud-csi.yml"; # gh-release-update
     home-manager.inputs.nixpkgs.follows = "nixpkgs";

diff --git a/flake/packages.nix b/flake/packages.nix
@@ -124,7 +124,6 @@
         ];
         zjstatus = inputs.zjstatus.packages.${system}.default;
         zwift = inputs.zwift.packages.${system}.default;
-        helix-latest = inputs.helix.packages.${system}.helix;
         persway = inputs.persway.packages.${system}.default;
         wezterm = inputs.wezterm.packages.${system}.default;
         unlockremote = pkgs.writeShellApplication {

diff --git a/users/profiles/helix.nix b/users/profiles/helix.nix
@@ -1,17 +1,7 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  copilot = pkgs.writeShellApplication {
-    name = "copilot";
-    text = ''
-      exec ${pkgs.nodejs}/bin/node ${inputs.copilot-vim}/dist/language-server.js "''$@"
-    '';
-  };
-  helix-copilot = pkgs.writeShellApplication {
+{pkgs, ...}: let
+  helix-ai = pkgs.writeShellApplication {
     name = "hx";
-    runtimeInputs = [copilot];
+    runtimeInputs = [pkgs.lsp-ai];
     text = ''
       if [ -e /run/agenix/groq-lsp-ai ]; then
         GROQ_API_KEY="$(cat /run/agenix/groq-lsp-ai)"
@@ -21,19 +11,13 @@
         ANTHROPIC_API_KEY="$(cat /run/agenix/anthropic-lsp-ai)"
         export ANTHROPIC_API_KEY
       fi
-
-      if [ -n "$GROQ_API_KEY" ] || [ -n "$ANTHROPIC_API_KEY" ]; then
-        exec ${pkgs.helix-latest}/bin/hx "''$@"
-      else
-        exec ${pkgs.helix-latest}/bin/hx -a "''$@"
-      fi
+      exec ${pkgs.helix}/bin/hx "''$@"
     '';
   };
 in {
-  home.packages = [pkgs.lsp-ai];
   programs.helix = {
     enable = true;
-    package = helix-copilot;
+    package = helix-ai;
     settings = {
       theme = "catppuccin_frappe";
 
@@ -64,7 +48,6 @@ in {
           auto-signature-help = false;
           display-messages = true;
           display-inlay-hints = true;
-          #copilot-auto = true;
         };
 
         statusline = {
@@ -81,9 +64,6 @@ in {
       };
 
       keys = {
-        insert = {
-          right = "copilot_apply_completion";
-        };
         normal = {
           space = {
             t = ":open lsp-ai-chat.md";
@@ -96,10 +76,6 @@ in {
     };
     languages = {
       language-server = {
-        #copilot = {
-        #  command = "${copilot}/bin/copilot";
-        #  args = ["--stdio"];
-        #};
         lsp-ai = {
           command = "lsp-ai";
           config.memory.file_store = {};