From 609291820e09c823d1e04b9292cb72f13efe4917 Mon Sep 17 00:00:00 2001
From: mat ess <mat@mat.services>
Date: Sun, 25 Sep 2022 22:34:46 -0400
Subject: [PATCH] Switch things around

---
 darwin/general.nix  |  1 -
 darwin/homebrew.nix |  2 +-
 home/fish.nix       | 14 +++++---------
 home/programs.nix   |  4 ++++
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/darwin/general.nix b/darwin/general.nix
index d023cde..09b6a27 100644
--- a/darwin/general.nix
+++ b/darwin/general.nix
@@ -14,7 +14,6 @@
   environment.variables = {
     TERMINFO_DIRS = [ "${pkgs.kitty.terminfo.outPath}/share/terminfo" ];
   };
-  programs.nix-index.enable = true;
 
   # Fonts
   fonts.fontDir.enable = true;
diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix
index 9d4f4ac..ffbb5a8 100644
--- a/darwin/homebrew.nix
+++ b/darwin/homebrew.nix
@@ -98,6 +98,6 @@ in
     "fileicon"
     "fzf"
     "gifsicle"
-    # "unison-language"
+    "unison-language"
   ];
 }
diff --git a/home/fish.nix b/home/fish.nix
index 4b06049..a9a999f 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -153,19 +153,15 @@
       '';
     };
 
-    darwin-rebuild-edit-kakoune = {
-      argumentNames = [ "file" ];
+    darwin-rebuild-edit-with = {
+      argumentNames = [ "file" "editor" ];
       body = ''
         if test -z "$file"
           set file flake.nix
         end
-        from-nix kak $file
+        from-nix $editor $file
       '';
     };
-
-    fish_command_not_found.body = ''
-      command_not_found_handle $argv
-    '';
   };
   # }}}
 
@@ -189,8 +185,8 @@
       drc = "code ${nixConfigDir}";
       # edit darwin-rebuild config in vim
       drv = "vim ${nixConfigDir}";
-      # edit darwin-rebuild config in kakoune
-      drk = "darwin-rebuild-edit-kakoune";
+      # edit darwin-rebuild config in helix
+      drh = "darwin-rebuild-edit-with hx";
       flakeup = "nix flake update ${nixConfigDir}/";
       nb = "nix build";
       nd = "nix develop";
diff --git a/home/programs.nix b/home/programs.nix
index b242feb..13812b5 100644
--- a/home/programs.nix
+++ b/home/programs.nix
@@ -41,6 +41,10 @@
     helix = {
       enable = true;
     };
+    nix-index = {
+      enable = true;
+      enableFishIntegration = true;
+    };
     ssh = {
       enable = true;
       matchBlocks."*".extraOptions = {