From 55ae559afc1cfc472da4779ed954341ca3bb5f78 Mon Sep 17 00:00:00 2001
From: Aria Nolan <tacocat@chytrid.xyz>
Date: Fri, 20 Oct 2023 21:13:32 -0400
Subject: [PATCH] fixed helix

---
 flake.nix                       |  8 +-------
 users/tacocat/helix/default.nix | 36 ++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/flake.nix b/flake.nix
index 696745c..4b5a2d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,18 +54,12 @@
     #homeConfigurations: define options for different users
     homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration {
       inherit pkgs;
+      extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
       modules = [
         ./users/tacocat/home.nix
-        # ./users/tacocat/programs
-        # ./users/tacocat/shell
-        # ./users/tacocat/helix
-        # ./users/tacocat/emacs
-        # this is awful why are you doing it like this
       ];
     };
 
-    extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
-
     #outputs home-manager activation package for use on non-NixOS, i think?
     packages.${system}."tacocat" = self.homeConfigurations."tacocat".activationPackage;
   };
diff --git a/users/tacocat/helix/default.nix b/users/tacocat/helix/default.nix
index a310e1b..de92851 100644
--- a/users/tacocat/helix/default.nix
+++ b/users/tacocat/helix/default.nix
@@ -12,24 +12,24 @@
     enable = true;
     # package = inputs.helix.packages."x86_64-linux".default;
 
-    # package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: {
-    #   makeWrapperArgs = with pkgs;
-    #     self.makeWrapperArgs
-    #     or []
-    #     ++ [
-    #       "--suffix"
-    #       "PATH"
-    #       ":"
-    #       (lib.makeBinPath [
-    #         clang-tools
-    #         marksman
-    #         nil
-    #         nodePackages.bash-language-server
-    #         shellcheck
-    #         java-language-server
-    #       ])
-    #     ];
-    # });
+    package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: {
+      makeWrapperArgs = with pkgs;
+        self.makeWrapperArgs
+        or []
+        ++ [
+          "--suffix"
+          "PATH"
+          ":"
+          (lib.makeBinPath [
+            clang-tools
+            marksman
+            nil
+            nodePackages.bash-language-server
+            shellcheck
+            java-language-server
+          ])
+        ];
+    });
 
     settings = {
       theme = "rose_pine_moon";