From 680899a0c022e1bb300ec3b16611bd906a03f3d7 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 27 Dec 2024 15:00:15 -0600 Subject: [PATCH] Ghostty --- flake.lock | 118 +++++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 8 ++++ 2 files changed, 117 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2d95732..9433e2d 100644 --- a/flake.lock +++ b/flake.lock @@ -117,10 +117,44 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -135,9 +169,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -170,9 +204,34 @@ "type": "github" } }, - "git-hooks": { + "ghostty": { "inputs": { "flake-compat": "flake-compat", + "nixpkgs-stable": [ + "nixpkgs" + ], + "nixpkgs-unstable": [ + "nixpkgs-unstable" + ], + "zig": "zig" + }, + "locked": { + "lastModified": 1735330177, + "narHash": "sha256-JGoqNnhSr632eLo1NWKJWoZyepCZlXT0o1/2A6e1Ph4=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "8111f5b9958c21e0157f63cc4ce2dfc2329c67ac", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -195,7 +254,7 @@ }, "git-hooks_2": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_3", "nixpkgs": [ "slippi", @@ -317,7 +376,7 @@ "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, @@ -416,7 +475,7 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -728,7 +787,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", "nixpkgs": [ "hyprland", @@ -753,6 +812,7 @@ "root": { "inputs": { "disko": "disko", + "ghostty": "ghostty", "git-hooks": "git-hooks", "hardware": "hardware", "helix": "helix", @@ -870,6 +930,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -884,7 +959,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -901,7 +976,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", @@ -968,6 +1043,31 @@ "type": "github" } }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, "zlib": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 6c4f211..28bb7f1 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,10 @@ jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development"; jovian.inputs.nixpkgs.follows = "nixpkgs-unstable"; + ghostty.url = "github:ghostty-org/ghostty"; + ghostty.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable"; + ghostty.inputs.nixpkgs-stable.follows = "nixpkgs"; + # nnf.url = "github:thelegy/nixos-nftables-firewall?rev=71fc2b79358d0dbacde83c806a0f008ece567b7b"; mobile-nixos = { @@ -51,6 +55,7 @@ "https://nix-community.cachix.org" "https://nix.h.lyte.dev" "https://hyprland.cachix.org" + "https://ghostty.cachix.org" ]; extra-trusted-public-keys = [ @@ -59,6 +64,7 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "h.lyte.dev-2:te9xK/GcWPA/5aXav8+e5RHImKYMug8hIIbhHsKPN0M=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" ]; }; @@ -79,6 +85,7 @@ # nnf, # hyprland, slippi, + ghostty, ... }: let inherit (self) outputs; @@ -481,6 +488,7 @@ ]; }; environment.systemPackages = with pkgs; [ + ghostty.outputs.packages.${pkgs.system}.ghostty fw-ectool (writeShellApplication {