From a57fc1c6c5d983132acdefe09808797ee5e2a46c Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Mon, 10 Mar 2025 10:28:50 -0500 Subject: [PATCH] add ghostty package --- flake.lock | 216 ++++++++++++++++++++++++++---- flake.nix | 5 + nixos/hosts/shadowfax/default.nix | 1 + nixos/hosts/telchar/default.nix | 1 + 4 files changed, 195 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 81bb773..80aac16 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -168,6 +168,22 @@ } }, "flake-compat_3": { + "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-compat_4": { "flake": false, "locked": { "lastModified": 1733328505, @@ -263,7 +279,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -335,7 +351,25 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" + }, + "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_6": { + "inputs": { + "systems": "systems_10" }, "locked": { "lastModified": 1681202837, @@ -366,6 +400,30 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig", + "zig2nix": "zig2nix" + }, + "locked": { + "lastModified": 1739487834, + "narHash": "sha256-HZiuxnflLT9HXU7bc0xrk5kJJHQGNTQ2QXMZS7bE2u8=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "ee963f62968264157003d84d579b46b9df2e7806", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "ref": "v1.1.2", + "repo": "ghostty", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -535,7 +593,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -742,7 +800,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1740265014, @@ -874,7 +932,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -1001,8 +1059,8 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs-unstable" ] @@ -1023,7 +1081,7 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -1130,7 +1188,39 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1738255539, + "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { + "locked": { + "lastModified": 1738136902, + "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_2": { "locked": { "lastModified": 1741010256, "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", @@ -1302,12 +1392,12 @@ "nvf": { "inputs": { "flake-parts": "flake-parts_3", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "mnw": "mnw", "nil": "nil", "nixpkgs": "nixpkgs_5", "nmd": "nmd", - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1741120430, @@ -1368,7 +1458,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -1391,7 +1481,7 @@ }, "purescript-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nix-inspect", "nci", @@ -1436,6 +1526,7 @@ "ags": "ags", "buildbot-nix": "buildbot-nix", "disko": "disko", + "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", @@ -1447,7 +1538,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-unstable": "nixpkgs-unstable_2", "nixvirt-git": "nixvirt-git", "nur": "nur", "nvf": "nvf", @@ -1560,18 +1651,33 @@ "type": "github" } }, - "systems_2": { + "systems_10": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", + "type": "github" + } + }, + "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" } }, @@ -1592,16 +1698,16 @@ }, "systems_4": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1767,7 +1873,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -1842,6 +1948,60 @@ "repo": "zen-browser-flake", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1738239110, + "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "1a8fb6f3a04724519436355564b95fce5e272504", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1738263917, + "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", + "owner": "jcollie", + "repo": "zig2nix", + "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "type": "github" + }, + "original": { + "owner": "jcollie", + "repo": "zig2nix", + "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1049ddc..69d7871 100644 --- a/flake.nix +++ b/flake.nix @@ -290,5 +290,10 @@ buildbot-nix = { url = "github:nix-community/buildbot-nix"; }; + + # Ghostty 👻 - Awesome terminal that uses GPU acceleration + ghostty = { + url = "github:ghostty-org/ghostty/v1.1.2"; + }; }; } diff --git a/nixos/hosts/shadowfax/default.nix b/nixos/hosts/shadowfax/default.nix index b6db966..7c9ca69 100644 --- a/nixos/hosts/shadowfax/default.nix +++ b/nixos/hosts/shadowfax/default.nix @@ -54,6 +54,7 @@ in { # System packages systemPackages = with pkgs; [ inputs.zen-browser.packages."${system}".default # beta + inputs.ghostty.packages."${system}".default # terminal pavucontrol # Pulseaudio volume control zulu # dev diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix index a711724..dcb97af 100644 --- a/nixos/hosts/telchar/default.nix +++ b/nixos/hosts/telchar/default.nix @@ -16,6 +16,7 @@ systemPackages = with pkgs; [ # myPkgs.modrinth-app-unwrapped inputs.zen-browser.packages."${system}".default # beta + inputs.ghostty.packages."${system}".default # terminal dconf-editor fastfetch gtk3