From ae9c127b5c14cabe84d5979d96f76e97921beb4c Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 27 Apr 2026 14:08:58 +0800 Subject: [PATCH] chore: cleanup flake inputs --- flake.lock | 162 +++-------------------------- flake.nix | 4 - home/base/gui/terminal/ghostty.nix | 2 - 3 files changed, 12 insertions(+), 156 deletions(-) diff --git a/flake.lock b/flake.lock index 1b338489..4fb66339 100644 --- a/flake.lock +++ b/flake.lock @@ -238,22 +238,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1767039857, @@ -269,7 +253,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "locked": { "lastModified": 1761640442, "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", @@ -284,7 +268,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1767039857, @@ -362,7 +346,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -378,32 +362,9 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat_2", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3", - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1773642602, - "narHash": "sha256-WX66DS0cs6sRutHhJqSGYHrffpszsgmJsl+O7kl4Hjs=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "600f59ae313adf377c0bf0d754fa258257f5f65f", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "ref": "tip", - "repo": "ghostty", - "type": "github" - } - }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", "nixpkgs": [ "nix-gaming", @@ -557,27 +518,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770586272, - "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -642,8 +582,8 @@ "blueprint": "blueprint", "bun2nix": "bun2nix", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", - "systems": "systems_3", + "nixpkgs": "nixpkgs_3", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -753,7 +693,7 @@ }, "nixos-apple-silicon": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ] @@ -943,19 +883,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1770537093, - "narHash": "sha256-XV30uo8tXuxdzuV8l3sojmlPRLd/8tpMsOp4lNzLGUo=", - "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre942631.fef9403a3e4d/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1776329215, "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", @@ -971,7 +898,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1773821835, "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", @@ -1046,7 +973,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -1069,7 +996,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" @@ -1111,9 +1038,8 @@ "blender-bin": "blender-bin", "catppuccin": "catppuccin", "disko": "disko", - "ghostty": "ghostty", "haumea": "haumea", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", "llm-agents": "llm-agents", "my-asahi-firmware": "my-asahi-firmware", @@ -1123,7 +1049,7 @@ "nixos-apple-silicon": "nixos-apple-silicon", "nixos-generators": "nixos-generators", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-2505": "nixpkgs-2505", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", @@ -1214,7 +1140,6 @@ } }, "systems_2": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1244,21 +1169,6 @@ "type": "github" } }, - "systems_4": { - "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": [ @@ -1295,54 +1205,6 @@ "repo": "wallpapers", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty", - "flake-compat" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1773145353, - "narHash": "sha256-dE8zx8WA54TRmFFQBvA48x/sXGDTP7YaDmY6nNKMAYw=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "8666155d83bf792956a7c40915508e6d4b2b8716", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768231828, - "narHash": "sha256-wL/8Iij4T2OLkhHcc4NieOjf7YeJffaUYbCiCqKv/+0=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zon2nix", - "rev": "c28e93f3ba133d4c1b1d65224e2eebede61fd071", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e75625ba..43a328cb 100644 --- a/flake.nix +++ b/flake.nix @@ -122,10 +122,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - ghostty = { - url = "github:ghostty-org/ghostty/tip"; # Latest Continuous Release - }; - blender-bin = { url = "github:edolstra/nix-warez?dir=blender"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/base/gui/terminal/ghostty.nix b/home/base/gui/terminal/ghostty.nix index 1825d051..b807aaab 100644 --- a/home/base/gui/terminal/ghostty.nix +++ b/home/base/gui/terminal/ghostty.nix @@ -1,6 +1,5 @@ { pkgs, - ghostty, ... }: ########################################################### @@ -16,7 +15,6 @@ pkgs.hello # pkgs.ghostty is currently broken on darwin else pkgs.ghostty; # the stable version - # package = ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default; # the latest version enableBashIntegration = false; installBatSyntax = false; # installVimSyntax = true;