From 47b2ec156f01dbc6e358f4aa055c4a16193de4d1 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 2 Jan 2025 10:44:10 -0500 Subject: [PATCH] ghostty pkg now upstreamed --- flake.lock | 165 ++++++----------------------------- flake.nix | 1 - modules/home/all/ghostty.nix | 2 +- overlays/default.nix | 1 - 4 files changed, 28 insertions(+), 141 deletions(-) diff --git a/flake.lock b/flake.lock index 6242d14..5462bf3 100644 --- a/flake.lock +++ b/flake.lock @@ -346,25 +346,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" - }, - "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_5" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -380,9 +362,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -398,9 +380,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1681202837, @@ -431,26 +413,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1735243222, - "narHash": "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "4b4d4062dfed7b37424c7210d1230242c709e990", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "flake": false, "locked": { @@ -719,7 +681,7 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -963,7 +925,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1730717277, @@ -1106,7 +1068,7 @@ }, "nixos-vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_4" }, "locked": { @@ -1152,22 +1114,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1183,22 +1129,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1703013332, @@ -1340,7 +1270,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1373,7 +1303,7 @@ "nix-systems-x86_64-linux": "nix-systems-x86_64-linux", "nixpkgs": "nixpkgs_7", "rust-flake": "rust-flake", - "systems": "systems_8", + "systems": "systems_7", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1398,7 +1328,7 @@ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1732021966, @@ -1420,7 +1350,6 @@ "agenix": "agenix", "disko": "disko", "flake-parts": "flake-parts_2", - "ghostty": "ghostty", "git-hooks": "git-hooks", "github-nix-ci": "github-nix-ci", "home-manager": "home-manager_2", @@ -1462,7 +1391,7 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nuenv", "nixpkgs" @@ -1514,21 +1443,6 @@ } }, "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=", @@ -1543,6 +1457,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_4": { "locked": { "lastModified": 1681028828, @@ -1603,21 +1532,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1721,31 +1635,6 @@ "repo": "xdg-desktop-portal-hyprland", "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 10a3d5e..3cd81fa 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ actualism-app.url = "github:srid/actualism-app"; omnix.url = "github:juspay/omnix"; hyprland.url = "github:hyprwm/Hyprland/v0.46.2"; - ghostty.url = "github:ghostty-org/ghostty"; # Neovim nixvim.url = "github:nix-community/nixvim"; diff --git a/modules/home/all/ghostty.nix b/modules/home/all/ghostty.nix index 1b1860c..154b861 100644 --- a/modules/home/all/ghostty.nix +++ b/modules/home/all/ghostty.nix @@ -1,4 +1,4 @@ -{ flake, pkgs, ... }: +{ pkgs, ... }: { programs.ghostty = { enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index 0ba5ae4..46b4118 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,5 +16,4 @@ self: super: { actualism-app = inputs.actualism-app.packages.${self.system}.default; omnix = inputs.omnix.packages.${self.system}.default; git-merge-and-delete = self.callPackage "${packages}/git-merge-and-delete.nix" { }; - ghostty = inputs.ghostty.packages.${self.system}.default; }