From bc410d8e097a2688e5a8ae69ccd3bfdb7b265378 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Tue, 16 Dec 2025 12:07:08 +0100 Subject: [PATCH] Revert "ghostty tip" This reverts commit f0025dfde365c1326d5aff0647809b88df601251. --- flake.lock | 209 ++++++------------------------------------- flake.nix | 1 - profiles/ghostty.nix | 4 +- 3 files changed, 27 insertions(+), 187 deletions(-) diff --git a/flake.lock b/flake.lock index 89f3d00..6f523a6 100644 --- a/flake.lock +++ b/flake.lock @@ -22,7 +22,7 @@ "llm-agents", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1763308703, @@ -112,22 +112,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -182,25 +166,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -216,9 +182,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -234,32 +200,9 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1765830533, - "narHash": "sha256-7+LZM0VZwnD3nzrZLCLIaNiqaa3lSiLTZrq0eyNn53k=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "0a0068002aab2e238b14f70b0884153f8c89ac77", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "gomod2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "tangled", "nixpkgs" @@ -280,28 +223,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755776884, - "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -422,7 +343,7 @@ "llm-agents": { "inputs": { "blueprint": "blueprint", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -472,15 +393,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz" + "lastModified": 1765772535, + "narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -499,22 +423,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1765772535, - "narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1765779637, "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", @@ -530,7 +438,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1765644376, "narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=", @@ -546,7 +454,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1754800730, "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", @@ -565,8 +473,8 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", - "systems": "systems_3" + "nixpkgs": "nixpkgs_3", + "systems": "systems_2" }, "locked": { "lastModified": 1765841289, @@ -587,13 +495,12 @@ "darwin": "darwin", "disko": "disko", "flake-parts": "flake-parts", - "ghostty": "ghostty", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", "llm-agents": "llm-agents", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "sops-nix": "sops-nix", "tangled": "tangled", @@ -714,25 +621,10 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tangled": { "inputs": { "actor-typeahead-src": "actor-typeahead-src", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gomod2nix": "gomod2nix", "htmx-src": "htmx-src", "htmx-ws-src": "htmx-ws-src", @@ -780,40 +672,11 @@ "type": "github" } }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty", - "flake-compat" - ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763295135, - "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, "zjstatus": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay" }, "locked": { @@ -829,28 +692,6 @@ "repo": "zjstatus", "type": "github" } - }, - "zon2nix": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758405547, - "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b81f74b..f70f2c6 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ url = "github:homebrew/homebrew-cask"; flake = false; }; - ghostty.url = "github:ghostty-org/ghostty"; nixvim.url = "github:nix-community/nixvim"; zjstatus.url = "github:dj95/zjstatus"; llm-agents.url = "github:numtide/llm-agents.nix"; diff --git a/profiles/ghostty.nix b/profiles/ghostty.nix index 4ee68bb..6e1f7e3 100644 --- a/profiles/ghostty.nix +++ b/profiles/ghostty.nix @@ -1,7 +1,7 @@ -{inputs, pkgs, ...}: { +{pkgs, ...}: { programs.ghostty = { enable = true; - package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default; + package = pkgs.ghostty-bin; settings = { command = "${pkgs.fish}/bin/fish"; theme = "Catppuccin Latte";