From 2e4467b6eab4a5cc94a0c24735258a02512ceb15 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Wed, 29 Oct 2025 12:03:20 -0400
Subject: [PATCH] try to make builds work

---
 flake.lock                                    | 24 -------------------
 flake.nix                                     | 12 +++++-----
 lib/default.nix                               |  2 +-
 overlays/awscli2.nix                          |  6 +++++
 .../modules/nmasur/presets/programs/helix.nix |  2 +-
 .../modules/nmasur/profiles/experimental.nix  |  1 +
 .../modules/nmasur/profiles/power-user.nix    |  2 +-
 7 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/flake.lock b/flake.lock
index f0665ee..a97cacb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -148,29 +148,6 @@
         "type": "github"
       }
     },
-    "helix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "rust-overlay"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762973522,
-        "narHash": "sha256-CFyvvZvKDkTFF7niIQp5hhks5OR1u10H3e89chURCkg=",
-        "owner": "helix-editor",
-        "repo": "helix",
-        "rev": "948ac05aa0db64e0e5d00710db36eb244076e988",
-        "type": "github"
-      },
-      "original": {
-        "owner": "helix-editor",
-        "repo": "helix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -363,7 +340,6 @@
       "inputs": {
         "darwin": "darwin",
         "disko": "disko",
-        "helix": "helix",
         "home-manager": "home-manager",
         "mac-app-util": "mac-app-util",
         "nix2vim": "nix2vim",
diff --git a/flake.nix b/flake.nix
index 77e559c..cb94512 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,12 +75,12 @@
       inputs.rust-overlay.follows = "rust-overlay";
     };
 
-    # Text editor
-    helix = {
-      url = "github:helix-editor/helix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.rust-overlay.follows = "rust-overlay";
-    };
+    # # Text editor
+    # helix = {
+    #   url = "github:helix-editor/helix";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    #   inputs.rust-overlay.follows = "rust-overlay";
+    # };
 
     # # Nextcloud Apps
     # nextcloud-news = {
diff --git a/lib/default.nix b/lib/default.nix
index 6041266..7176195 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -67,7 +67,7 @@ lib
     inputs.nur.overlays.default
     inputs.nix2vim.overlay
     inputs.zellij-switch.overlays.default
-    inputs.helix.overlays.default
+    # inputs.helix.overlays.default
   ]
   ++ (importOverlays ../overlays);
 
diff --git a/overlays/awscli2.nix b/overlays/awscli2.nix
index 55f8d5e..396e38a 100644
--- a/overlays/awscli2.nix
+++ b/overlays/awscli2.nix
@@ -2,6 +2,12 @@ inputs: _final: prev: {
 
   awscli2 = prev.awscli2.overrideAttrs (
     finalAttrs: previousAttrs: {
+      src = prev.fetchFromGitHub {
+        owner = "aws";
+        repo = "aws-cli";
+        rev = "2.31.27";
+        hash = "sha256-NnAEdbIZVri9Bi0KBlcZIVox+LbuD0/hBdtYB/UFHeo=";
+      };
       disabledTestPaths = previousAttrs.disabledTestPaths ++ [
         "tests/unit/customizations"
       ];
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
index da9af36..fa44c91 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix
@@ -189,7 +189,7 @@ in
             auto-format = true;
             file-types = [ "hcl" ];
             formatter = {
-              command = lib.getExe pkgs.packer;
+              command = "${pkgs.packer}/bin/packer";
               args = [
                 "fmt"
                 "-"
diff --git a/platforms/home-manager/modules/nmasur/profiles/experimental.nix b/platforms/home-manager/modules/nmasur/profiles/experimental.nix
index 12e7b79..bb2fa4b 100644
--- a/platforms/home-manager/modules/nmasur/profiles/experimental.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/experimental.nix
@@ -29,6 +29,7 @@ in
       pkgs.pop # Send emails from a TUI
 
       pkgs.crush # AI LLM Agent
+      pkgs.gemini-cli # AI LLM Agent
 
     ];
 
diff --git a/platforms/home-manager/modules/nmasur/profiles/power-user.nix b/platforms/home-manager/modules/nmasur/profiles/power-user.nix
index 9be0d0e..fc65242 100644
--- a/platforms/home-manager/modules/nmasur/profiles/power-user.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/power-user.nix
@@ -66,7 +66,7 @@ in
       helix.enable = lib.mkDefault true;
       jujutsu.enable = lib.mkDefault true;
       lazygit.enable = lib.mkDefault true;
-      neovim.enable = lib.mkDefault true;
+      # neovim.enable = lib.mkDefault true;
       nix-index.enable = lib.mkDefault true;
       nixpkgs.enable = lib.mkDefault true;
       notes.enable = lib.mkDefault true;