fix helix-gpt

ldmsh · Aug 28, 2024 · 3401583 · 3401583
1 parent 4b4479d
commit 3401583
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 29 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -34,7 +34,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # ldr-private.url = "git+file:///home/ldr/.dotfiles-private";
+    # ldr-private.url = "git+file:///home/ldmsh/private-dotfiles";
+
+    nixpkgs-working-bun = {
+      url = "github:nixos/nixpkgs/9e58aca561e18f5197029926db8dbde1738a2ff5";
+    };
 
     push2talk = {
       url = "github:cyrinux/push2talk";

diff --git a/hosts/ldr-darwin/default.nix b/hosts/ldr-darwin/default.nix
@@ -11,7 +11,15 @@ inputs.nix-darwin.lib.darwinSystem rec {
     inputs.home-manager.darwinModules.home-manager
     ../../modules/macos
     {
-      nixpkgs.overlays = [ inputs.firefox-darwin.overlay ];
+      nixpkgs.overlays = [
+        inputs.firefox-darwin.overlay
+        # Add an overlay to override helix-gpt with a specific version of bun
+        (final: prev: {
+          helix-gpt = prev.helix-gpt.override {
+            bun = inputs.nixpkgs-working-bun.legacyPackages.${system}.bun;
+          };
+        })
+      ];
 
       home-manager.users.${globals.user}.imports = [
         inputs.sops-nix.homeManagerModules.sops

diff --git a/modules/common/helix.nix b/modules/common/helix.nix
@@ -179,7 +179,6 @@
 
       language-server.gpt = {
         command = "helix-gpt";
-        args = [ "--handler" "copilot" ];
       };
 
       language-server.rust-analyzer.config.check = {

diff --git a/modules/macos/packages.nix b/modules/macos/packages.nix
@@ -48,7 +48,7 @@
     # which
     # yq
     # zstd
-
+    helix-gpt
     # nodejs_20
     # bun
 

diff --git a/overlay/bin/backup b/overlay/bin/backup
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SOURCE=".dotfiles .dotfiles-private .ssh .gnupg .zsh_history $XDG_STATE_HOME/wl-clipboard-manager .password-store .password-store-g .mozilla .mail giveffektivt enowise cloud decrypted $XDG_STATE_HOME/pgcli"
+SOURCE=".dotfiles private-dotfiles .ssh .gnupg .zsh_history $XDG_STATE_HOME/wl-clipboard-manager .password-store .password-store-g .mozilla .mail giveffektivt enowise cloud decrypted $XDG_STATE_HOME/pgcli"
 BACKUP_PATH="/run/media/$USER/backup_wd_data"
 BACKUP_DIR="$BACKUP_PATH/$(date +%Y-%m-%d)"
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ @@
         # which
         # yq
         # zstd
+        helix-gpt
         # nodejs_20
         # bun
@@ Expand Down @@