From 488742e77cad67ceb57b56a835150d528f6df2f3 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Wed, 15 Jan 2025 13:00:59 -0600 Subject: [PATCH] use nixpkgs ghostty --- flake.lock | 157 +++++++----------------------------- flake.nix | 18 ++--- hosts/othalan/settings/pkgs | 2 +- 3 files changed, 38 insertions(+), 139 deletions(-) diff --git a/flake.lock b/flake.lock index 927e863..9389f8c 100644 --- a/flake.lock +++ b/flake.lock @@ -91,22 +91,6 @@ } }, "flake-compat_2": { - "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_3": { "flake": false, "locked": { "lastModified": 1733328505, @@ -122,7 +106,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1717312683, "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", @@ -161,25 +145,7 @@ }, "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_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -195,9 +161,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -213,9 +179,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -246,32 +212,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": [ - "nixpkgs" - ], - "nixpkgs-unstable": [ - "nixpkgs" - ], - "zig": "zig" - }, - "locked": { - "lastModified": 1735678070, - "narHash": "sha256-BiXFNeoL+BYpiqzCuDIrZGQ6JVI8cBOXerJH48CbnxU=", - "ref": "refs/tags/v1.0.1", - "rev": "4fdb1d7d47544e4b3912e32343f4075c5a9744b8", - "revCount": 8696, - "type": "git", - "url": "https://github.com/ghostty-org/ghostty.git" - }, - "original": { - "ref": "refs/tags/v1.0.1", - "type": "git", - "url": "https://github.com/ghostty-org/ghostty.git" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -366,7 +306,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -561,7 +501,7 @@ }, "jj": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], @@ -584,7 +524,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { @@ -617,7 +557,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -776,7 +716,7 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs" }, "locked": { @@ -826,7 +766,7 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": "nixpkgs_4" @@ -947,7 +887,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -972,7 +912,6 @@ "inputs": { "NixVirt": "NixVirt", "f1multiviewer": "f1multiviewer", - "ghostty": "ghostty", "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", "hyprman": "hyprman", @@ -1050,21 +989,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1079,6 +1003,21 @@ "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" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -1109,21 +1048,6 @@ "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1250,31 +1174,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 f56a131..88bcd92 100644 --- a/flake.nix +++ b/flake.nix @@ -38,15 +38,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # https://github.com/NixOS/nixpkgs/pull/368404 replace when PR merged? - # https://github.com/ghostty-org/ghostty/issues/2025 - ghostty = { - url = "git+https://github.com/ghostty-org/ghostty.git?ref=refs/tags/v1.0.1"; - inputs = { - nixpkgs-stable.follows = "nixpkgs"; - nixpkgs-unstable.follows = "nixpkgs"; - }; - }; + # using nixpkgs version now + # # https://github.com/ghostty-org/ghostty/issues/2025 + # ghostty = { + # url = "git+https://github.com/ghostty-org/ghostty.git?ref=refs/tags/v1.0.1"; + # inputs = { + # nixpkgs-stable.follows = "nixpkgs"; + # nixpkgs-unstable.follows = "nixpkgs"; + # }; + # }; hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/othalan/settings/pkgs b/hosts/othalan/settings/pkgs index bcafb0c..98a66ed 100644 --- a/hosts/othalan/settings/pkgs +++ b/hosts/othalan/settings/pkgs @@ -1,5 +1,5 @@ flake:utils -flake:ghostty +ghostty sops attic-client distrobox