From 92053af4960b7d695aef1a9f67e2e57f45cd6de9 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 6 Aug 2025 11:32:39 -0400
Subject: [PATCH] [flake] add ghostty input and remove tangled.sh nixpkgs
 override

---
 flake.lock                                | 104 +++++++++++++++++++++-
 flake.nix                                 |   9 +-
 modules/home/programs/ghostty/default.nix |   9 +-
 3 files changed, 116 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index c4e3f38b..6ddca5b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -267,6 +267,34 @@
         "type": "github"
       }
     },
+    "ghostty": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "zig": "zig",
+        "zon2nix": "zon2nix"
+      },
+      "locked": {
+        "lastModified": 1754485743,
+        "narHash": "sha256-G2WxnSI1G+fwvgQ43PDda53uvUGEOEis6MjNBPW5XUc=",
+        "owner": "ghostty-org",
+        "repo": "ghostty",
+        "rev": "1d042f1e71f1533f92831c50610efa7a1fc1856e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ghostty-org",
+        "repo": "ghostty",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": [
@@ -716,6 +744,22 @@
         "url": "https://nixpkgs.dev/channel/nixpkgs-unstable"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1751984180,
+        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -726,6 +770,7 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
+        "ghostty": "ghostty",
         "golink": "golink",
         "hardware": "hardware",
         "home-manager": "home-manager",
@@ -851,9 +896,7 @@
         "indigo": "indigo",
         "inter-fonts-src": "inter-fonts-src",
         "lucide-src": "lucide-src",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_3",
         "sqlite-lib-src": "sqlite-lib-src"
       },
       "locked": {
@@ -890,6 +933,61 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
+    },
+    "zig": {
+      "inputs": {
+        "flake-compat": [
+          "ghostty",
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "ghostty",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748261582,
+        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "type": "github"
+      }
+    },
+    "zon2nix": {
+      "inputs": {
+        "flake-utils": [
+          "ghostty",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ghostty",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742104771,
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
+        "owner": "jcollie",
+        "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jcollie",
+        "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index a1de9080..7e636c93 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,13 @@
       inputs.flake-utils.follows = "flake-utils";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    ghostty = {
+      url = "github:ghostty-org/ghostty";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.flake-compat.follows = "flake-compat";
+    };
     golink = {
       url = "github:tailscale/golink";
       inputs.systems.follows = "systems";
@@ -111,7 +118,6 @@
     };
     tangled-sh = {
       url = "git+https://tangled.sh/@tangled.sh/core";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
@@ -133,7 +139,6 @@
         self.overlays.pyronet-packages
         self.overlays.nix-index
         self.overlays.openssh-fixperms
-        # self.overlays.linux-firmware
         inputs.golink.overlays.default
       ];
     in
diff --git a/modules/home/programs/ghostty/default.nix b/modules/home/programs/ghostty/default.nix
index 56e50811..52f18b01 100644
--- a/modules/home/programs/ghostty/default.nix
+++ b/modules/home/programs/ghostty/default.nix
@@ -1,4 +1,10 @@
-{ lib, config, ... }:
+{
+  lib,
+  config,
+  inputs,
+  pkgs,
+  ...
+}:
 let
   cfg = config.py.programs.ghostty;
 in
@@ -7,6 +13,7 @@ in
   config.catppuccin.ghostty.enable = cfg.enable;
   config.programs.ghostty = lib.mkIf cfg.enable {
     enable = true;
+    package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default;
     enableFishIntegration = true;
     installBatSyntax = true;
     enableBashIntegration = true;
-- 
2.51.2