From 629ec6abcd2ef209e34a56aeb664fbde515cf178 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Wed, 10 Sep 2025 12:55:40 -0700
Subject: [PATCH] helix back on git :)

---
 flake.lock          | 43 +++++++++++++++++++++++++++++++++++++++++++
 flake.nix           | 13 +++++++------
 users/tao/helix.nix |  4 ++--
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index c0d87d5..49343e7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -165,6 +165,27 @@
         "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
       }
     },
+    "helix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1757513370,
+        "narHash": "sha256-uaTDniIFWEv6PXs6s9wRFAcoumBaUZCiZ4hzlNWeJAE=",
+        "owner": "helix-editor",
+        "repo": "helix",
+        "rev": "209558645a0a00660e74b0e14e6ec0a0b1fac590",
+        "type": "github"
+      },
+      "original": {
+        "owner": "helix-editor",
+        "repo": "helix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -413,6 +434,7 @@
         "agenix": "agenix",
         "determinate": "determinate",
         "disko": "disko",
+        "helix": "helix",
         "home-manager": "home-manager_2",
         "lsfg-vk-flake": "lsfg-vk-flake",
         "nixos": "nixos",
@@ -422,6 +444,27 @@
         "zen-browser": "zen-browser"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "helix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1740623427,
+        "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index a137d9e..473f509 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,10 +19,10 @@
             url = "github:nix-community/home-manager";
             inputs.nixpkgs.follows = "nixpkgs";
         };
-        # helix = {
-        #   url = "github:mattwparas/helix/steel-event-system";
-        #   inputs.nixpkgs.follows = "nixpkgs";
-        # };
+        helix = {
+            url = "github:helix-editor/helix";
+            inputs.nixpkgs.follows = "nixpkgs";
+        };
         zen-browser = {
             url = "github:0xc000022070/zen-browser-flake";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -33,11 +33,11 @@
 
     nixConfig = {
         extra-substituters = [
-            # "https://helix.cachix.org/"
+            "https://helix.cachix.org/"
             "https://devenv.cachix.org"
         ];
         extra-trusted-public-keys = [
-            # "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
+            "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
             "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
         ];
     };
@@ -54,6 +54,7 @@
         home-manager,
         zen-browser,
         lsfg-vk-flake,
+        helix,
         ...
     } @ inputs: {
         nixosConfigurations = {
diff --git a/users/tao/helix.nix b/users/tao/helix.nix
index c1c19d0..49f42d6 100644
--- a/users/tao/helix.nix
+++ b/users/tao/helix.nix
@@ -1,4 +1,4 @@
-{...}: {
+{inputs, pkgs, ...}: {
     programs.helix = {
         settings = {
             theme = "gruvbox_dark_hard";
@@ -262,6 +262,6 @@
         };
         enable = true;
         defaultEditor = true;
-        # package = inputs.helix.packages.${pkgs.system}.default;
+        package = inputs.helix.packages.${pkgs.system}.default;
     };
 }