diff --git a/home/modules/programs/ghostty/default.nix b/home/modules/programs/ghostty/default.nix index 5872acb3..6bee4c85 100644 --- a/home/modules/programs/ghostty/default.nix +++ b/home/modules/programs/ghostty/default.nix @@ -1,4 +1,4 @@ -{ghostty, ...}: _: { +{...}: {pkgs, ...}: { xdg.configFile."ghostty/config".text = # toml '' @@ -11,5 +11,5 @@ theme = "catppuccin-mocha" ''; - home.packages = [ghostty.packages.x86_64-linux.default]; + home.packages = [pkgs.ghostty]; } -- 2.51.2 From b1af0eb543cb378a4f8c2f9302f537e2618094c0 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 21 Jan 2025 08:03:31 +0100 Subject: [PATCH 2/2] remove ghostty input --- flake.lock | 118 ++++------------------------------------------------- flake.nix | 4 -- 2 files changed, 9 insertions(+), 113 deletions(-) diff --git a/flake.lock b/flake.lock index 67924b6f..77f388ec 100644 --- a/flake.lock +++ b/flake.lock @@ -2,8 +2,8 @@ "nodes": { "cargo2nix": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "switcher", "nixpkgs" @@ -51,22 +51,6 @@ } }, "flake-compat": { - "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_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -82,7 +66,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -98,7 +82,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -118,24 +102,6 @@ "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": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -150,9 +116,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -195,34 +161,9 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": [ - "nixpkgs" - ], - "nixpkgs-unstable": [ - "nixpkgs" - ], - "zig": "zig" - }, - "locked": { - "lastModified": 1737430029, - "narHash": "sha256-z55IQogW9z4HhVeT55LlCUFKbYD5O5aLMnU5cX1WTto=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "5cb2fa6f7594202b12a2603bf32094aa75b1bf0e", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nvim", @@ -337,7 +278,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": [ "parts" ], @@ -364,7 +305,7 @@ }, "nixos-vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -594,7 +535,6 @@ "root": { "inputs": { "emacs": "emacs", - "ghostty": "ghostty", "home-manager": "home-manager", "nix": "nix", "nixos-vscode-server": "nixos-vscode-server", @@ -702,21 +642,6 @@ "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" - } - }, "utils": { "locked": { "lastModified": 1678901627, @@ -731,31 +656,6 @@ "repo": "flake-utils", "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 86776fb8..78353f34 100644 --- a/flake.nix +++ b/flake.nix @@ -58,10 +58,6 @@ emacs.inputs.nixpkgs.follows = "nixpkgs"; emacs.inputs.nixpkgs-stable.follows = "nixpkgs"; - ghostty.url = "github:ghostty-org/ghostty"; - ghostty.inputs.nixpkgs-unstable.follows = "nixpkgs"; - ghostty.inputs.nixpkgs-stable.follows = "nixpkgs"; - nixos-vscode-server.url = "github:msteen/nixos-vscode-server"; nixos-vscode-server.inputs.nixpkgs.follows = "nixpkgs";