From 2b26252062151ca1b3067ae4eca29b3debec9a32 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 7 Aug 2024 19:00:03 +0200 Subject: [PATCH] fix(kilimandjaro): compile ghostty from source --- configs/desktop.nix | 2 +- flake.lock | 40 ++++++---------------------------------- flake.nix | 6 +++++- 3 files changed, 12 insertions(+), 36 deletions(-) diff --git a/configs/desktop.nix b/configs/desktop.nix index d38cd45..4b6fa2b 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -13,12 +13,12 @@ ./client.nix ../programs/ghostty.nix - ../programs/alacritty.nix ../programs/gnome.nix # ../programs/vscode.nix # the world if hyprland # ../programs/hyprland.nix + # ../programs/alacritty.nix ]; boot = { diff --git a/flake.lock b/flake.lock index 22aab72..2fd8b19 100644 --- a/flake.lock +++ b/flake.lock @@ -197,8 +197,12 @@ }, "ghostty": { "inputs": { - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-stable": [ + "nixpkgs" + ], + "nixpkgs-unstable": [ + "nixpkgs" + ], "zig": "zig", "zls": "zls" }, @@ -380,38 +384,6 @@ "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", diff --git a/flake.nix b/flake.nix index b4f26d7..0f790ad 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,11 @@ inputs.systems.follows = "systems"; }; - ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty"; + ghostty = { + url = "git+ssh://git@github.com/ghostty-org/ghostty"; + inputs.nixpkgs-unstable.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager";