From 364ce7740c9c52b1fdf717de59f709a7e5ab1fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <~@hauleth.dev>
Date: Mon, 3 Feb 2025 10:44:59 +0100
Subject: [PATCH] chore: update Ghostty HM module to built-in one

---
 flake.lock          | 72 ++++++++++++++++++---------------------------
 flake.nix           |  2 --
 modules/ghostty.nix | 12 ++++----
 users/hauleth.nix   |  1 -
 4 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7a0b3f8..bec8817 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733570843,
-        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
+        "lastModified": 1738277753,
+        "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
+        "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "darwin-stable": {
       "locked": {
-        "lastModified": 1733874782,
-        "narHash": "sha256-U1iCUaFCDJepmQuauoo408q8ZzVqAoxZx+T4f7+CBPU=",
+        "lastModified": 1738148668,
+        "narHash": "sha256-arE53pUYTdPbQ0Ctrd1xtltngqKn2EzIOKGhA480DvY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "df99c810dcdac631c3326a3e73c03bdd535b4eed",
+        "rev": "7dfcd13937964a3592766064a8bed6d2b9666eaa",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1736143030,
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -203,21 +203,6 @@
         "type": "github"
       }
     },
-    "ghostty": {
-      "locked": {
-        "lastModified": 1702368251,
-        "narHash": "sha256-hafrDmzGplzm+vdIo+LkOjRfA4qRcy5JmpGGksnht5c=",
-        "owner": "clo4",
-        "repo": "ghostty-hm-module",
-        "rev": "887e13a6e7acf5ffaab0119d96e476d84db90904",
-        "type": "github"
-      },
-      "original": {
-        "owner": "clo4",
-        "repo": "ghostty-hm-module",
-        "type": "github"
-      }
-    },
     "git-branchless": {
       "inputs": {
         "nixpkgs": [
@@ -225,11 +210,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733771262,
-        "narHash": "sha256-4qQTHCwVFStXP1hzuAtIjf7xDTyySCn4BII6h1TaS1M=",
+        "lastModified": 1737475923,
+        "narHash": "sha256-GuIPb8YSgDKXelYwEPZqXodAso9k0CLzBT6oRf0WlJ8=",
         "owner": "arxanas",
         "repo": "git-branchless",
-        "rev": "2cb84846811b3a20560ed8503adca7eb5bc331b0",
+        "rev": "ca7bddba1e64a2c470af1128ca87281d9af53501",
         "type": "github"
       },
       "original": {
@@ -245,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733951607,
-        "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=",
+        "lastModified": 1738275749,
+        "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34",
+        "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9",
         "type": "github"
       },
       "original": {
@@ -296,11 +281,11 @@
     "neorg": {
       "flake": false,
       "locked": {
-        "lastModified": 1733872345,
-        "narHash": "sha256-6pUwWfsJ0TmToGU7Bvaeobnj2vuIqwd4w3TDdTvQZSk=",
+        "lastModified": 1738251236,
+        "narHash": "sha256-J5PoxbtD0jKScY1ScfbHfv2IJpkS/a7T9qMFk6eepEM=",
         "owner": "nvim-neorg",
         "repo": "neorg",
-        "rev": "62671a7b03a1f38a6e5e03b006a9b6f8d804be0e",
+        "rev": "bdb29ea3e069f827d31973bc942c18793ee9fa64",
         "type": "github"
       },
       "original": {
@@ -321,11 +306,11 @@
         "norg-meta": "norg-meta"
       },
       "locked": {
-        "lastModified": 1733880019,
-        "narHash": "sha256-4NwCUoM7xJiWXBp4d4ewKrUrCu/N8AbLGZmhZULkq9Q=",
+        "lastModified": 1738326622,
+        "narHash": "sha256-sKRJfv7KCb2sjJQI9HRU0vH6HDLQ5QfrJilj7TSZ5EA=",
         "owner": "nvim-neorg",
         "repo": "nixpkgs-neorg-overlay",
-        "rev": "d07a670edd0baa311556dd583e24ccc005b4eee3",
+        "rev": "9dcb1b515a025dc8ace9c349090d62bbf94e9334",
         "type": "github"
       },
       "original": {
@@ -368,14 +353,14 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1733096140,
-        "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
+        "lastModified": 1735774519,
+        "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz"
       }
     },
     "nixpkgs_2": {
@@ -396,11 +381,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1733749988,
-        "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=",
+        "lastModified": 1738172511,
+        "narHash": "sha256-v/8yB8LIy/KsySZYN6rO/f4kCEkj+fTLkzR0TaNMB+w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68",
+        "rev": "762a398892576efcc76fb233befbd58c2cef59e0",
         "type": "github"
       },
       "original": {
@@ -457,7 +442,6 @@
         "darwin": "darwin",
         "darwin-stable": "darwin-stable",
         "flake-parts": "flake-parts",
-        "ghostty": "ghostty",
         "git-branchless": "git-branchless",
         "home-manager": "home-manager",
         "lix-module": "lix-module",
diff --git a/flake.nix b/flake.nix
index 68d2937..435eb73 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,8 +34,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    ghostty.url = "github:clo4/ghostty-hm-module";
-
     # nixvim = {
     #   url = "github:nix-community/nixvim";
     #   inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/ghostty.nix b/modules/ghostty.nix
index 3d11d4b..621c05c 100644
--- a/modules/ghostty.nix
+++ b/modules/ghostty.nix
@@ -1,13 +1,15 @@
 {
   config,
   lib,
+  pkgs,
   ...
-}: {
+}: let
+in {
   programs.ghostty = {
     enable = true;
-    package = null; # Set explicitly to null, as it is managed externally
+    package = null;
 
-    shellIntegration.enable = true;
+    enableFishIntegration = true;
 
     settings = {
       font-family = "Hosevka Term";
@@ -51,9 +53,5 @@
 
       command = toString (lib.getExe config.programs.fish.package);
     };
-
-    keybindings = {
-      "super+shift+m" = "toggle_quick_terminal";
-    };
   };
 }
diff --git a/users/hauleth.nix b/users/hauleth.nix
index 2865d75..6551418 100644
--- a/users/hauleth.nix
+++ b/users/hauleth.nix
@@ -1,6 +1,5 @@
 {inputs, ...}: {
   imports = [
-    inputs.ghostty.homeModules.default
     ../modules/fish.nix
     ../modules/direnv.nix
     ../modules/git.nix
-- 
2.51.2