From 9c0e7c4caed3886390103d811c58d39ae26c5bf0 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Mon, 7 Jul 2025 11:55:57 +0300 Subject: [PATCH] flake.lock: bump flake.nix: add ghostty modules/home/programs/terminal/ghostty.nix: switch to ghostty flake Signed-off-by: unexplrd --- flake.lock | 254 ++++++++++----------- flake.nix | 14 +- modules/home/programs/terminal/ghostty.nix | 2 + 3 files changed, 126 insertions(+), 144 deletions(-) diff --git a/flake.lock b/flake.lock index 18a997a..555eada 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750195929, - "narHash": "sha256-5gaf/9wuxtfKqAFnNlX74Vz2VMURa/UzyfuEyYv4tZw=", + "lastModified": 1751777244, + "narHash": "sha256-/czsZlnHv8Sl/u2syCzucxfVFLBHXWxvgicYmlk5YEE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "419a1cfaf34100008ff5fa97ce9ef3b194472f71", + "rev": "a0d66535286f557ccfb7c7c4c4ddc95cce96fc8b", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -235,6 +235,22 @@ } }, "flake-compat_3": { + "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_4": { "flake": false, "locked": { "lastModified": 1746162366, @@ -250,21 +266,6 @@ "type": "github" } }, - "flake-compat_4": { - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -339,21 +340,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -370,29 +356,27 @@ "type": "github" } }, - "git-hooks": { + "ghostty": { "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore_3", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nixpkgs": [ - "stylix", "nixpkgs" - ] + ], + "zig": "zig", + "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "lastModified": 1751869689, + "narHash": "sha256-WRATlWALRFNnhqABLRtLHlL7a838oJhMRMbaTgjvXYk=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "292d89dbe2ad246016411cc0f35dd0e3fffa44ca", "type": "github" }, "original": { - "owner": "cachix", - "repo": "git-hooks.nix", + "owner": "ghostty-org", + "repo": "ghostty", "type": "github" } }, @@ -440,28 +424,6 @@ "type": "github" } }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -486,11 +448,11 @@ ] }, "locked": { - "lastModified": 1751589297, - "narHash": "sha256-3q35cq6BPuwIRL3IoVKYPc72r3OleeuRyf4YAPjEqzA=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "83f978812c37511ef2ffaf75ffa72160483f738a", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -577,11 +539,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1751582011, - "narHash": "sha256-dZgXFCU9gzw3MOSzlf/O0jdptESNkz9S71sDlEKaeMk=", + "lastModified": 1751714318, + "narHash": "sha256-nkoRnDkRGaCT0JTuHcDXPCMkdmhUFEtI1TMUiQcrxfs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "3c9447ca53f76abd1372bca5749c9ef701fb76c0", + "rev": "6a5f4f5954a64bac718e3938f062d045256e7aeb", "type": "github" }, "original": { @@ -823,7 +785,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -846,41 +808,6 @@ "type": "github" } }, - "lix": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": "lix_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750776670, - "narHash": "sha256-EfA5K5EZAnspmraJrXQlziffVpaT+QDBiE6yKmuaNNQ=", - "rev": "c3c78a32273e89d28367d8605a4c880f0b6607e3", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c3c78a32273e89d28367d8605a4c880f0b6607e3.tar.gz?rev=c3c78a32273e89d28367d8605a4c880f0b6607e3" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz" - } - }, - "lix_2": { - "flake": false, - "locked": { - "lastModified": 1750762203, - "narHash": "sha256-LmQhjQ7c+AOkwhvR9GFgJOy8oHW35MoQRELtrwyVnPw=", - "rev": "38b358ce27203f972faa2973cf44ba80c758f46e", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/38b358ce27203f972faa2973cf44ba80c758f46e.tar.gz?rev=38b358ce27203f972faa2973cf44ba80c758f46e" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, "mysecrets": { "flake": false, "locked": { @@ -942,11 +869,11 @@ ] }, "locked": { - "lastModified": 1751170039, - "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9c932ae632d6b5150515e5749b198c175d8565db", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -957,7 +884,7 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ], @@ -997,16 +924,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751630398, - "narHash": "sha256-A75SJvGnlIqEgl1Hh0v7HJgSffEaInAHl338PSDgJso=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55dc7f458587ec5714dafc71de09b55a88789130", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1071,7 +998,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -1124,11 +1051,11 @@ "blueprint": "blueprint", "chaotic": "chaotic", "disko": "disko", + "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", "hyprsunset": "hyprsunset", "lanzaboote": "lanzaboote", - "lix": "lix", "mysecrets": "mysecrets", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", @@ -1150,11 +1077,11 @@ ] }, "locked": { - "lastModified": 1751510438, - "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", + "lastModified": 1751683029, + "narHash": "sha256-dYO5X5jK8bpQOeRAo8R5aUt6M/+Ji1cZgstZI7SQ2IA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", + "rev": "9e5e62a33a929a67a5427fb7324a6f583dced0b2", "type": "github" }, "original": { @@ -1232,13 +1159,8 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": [ - "home-manager" - ], "nixpkgs": [ "nixpkgs" ], @@ -1253,11 +1175,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751602277, - "narHash": "sha256-mlJeMDyj+B9QYNw/f9YdlBzvq6mcQ3dx5qjfepzV70I=", + "lastModified": 1751840923, + "narHash": "sha256-4HZxn+PrWytrWVg5c5SEetv3m9/k7rngJq27zKuRIfo=", "owner": "danth", "repo": "stylix", - "rev": "3c73dee2dbdf242a16a6e929f3e574dd0694d85a", + "rev": "5259682ce58d935f248297bf1c9793a5cee0787e", "type": "github" }, "original": { @@ -1409,11 +1331,11 @@ ] }, "locked": { - "lastModified": 1751553554, - "narHash": "sha256-OR68SOZ38NrAzHj7/PNLg/++yHYL7cVhBXi3+ZqvQ80=", + "lastModified": 1751822129, + "narHash": "sha256-aI8JTRZHynKKJQpNP5TJuHsFQpKfDVJbW/u99lTpGyg=", "owner": "abenz1267", "repo": "walker", - "rev": "9d5d964273a128c83ae74e9e3f6229ffac71db53", + "rev": "2f16a48d6fa4f0f16c7b2173a1ff434005c8ed32", "type": "github" }, "original": { @@ -1462,6 +1384,60 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748261582, + "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "aafb1b093fb838f7a02613b719e85ec912914221", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zon2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742104771, + "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", + "owner": "jcollie", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "type": "github" + }, + "original": { + "owner": "jcollie", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2be1274..74bf653 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "unexplrd's personal configuration"; inputs = { - lix = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # lix = { + # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; # neve = { # inputs.nixvim.follows = "nixvim"; # url = "git+https://gitea.linerds.us/unexplrd/Neve"; @@ -28,6 +28,10 @@ url = "github:nix-community/disko/latest"; inputs.nixpkgs.follows = "nixpkgs"; }; + ghostty = { + url = "github:ghostty-org/ghostty"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -72,7 +76,7 @@ nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs = { - url = "github:NixOS/nixpkgs/master"; + url = "github:NixOS/nixpkgs/nixos-unstable"; # workaround for `unexpected Nix daemon error: error: serialised integer 7022364302122705765 is too large for type 'j'` # url = "github:NixOS/nixpkgs/pull/413627/head"; }; diff --git a/modules/home/programs/terminal/ghostty.nix b/modules/home/programs/terminal/ghostty.nix index 0f69e74..cb12821 100644 --- a/modules/home/programs/terminal/ghostty.nix +++ b/modules/home/programs/terminal/ghostty.nix @@ -1,6 +1,7 @@ { config, lib, + perSystem, ... }: with lib; let @@ -12,6 +13,7 @@ in { config = mkIf cfg.enable { programs.ghostty = { enable = true; + package = perSystem.ghostty.ghostty; settings = { gtk-single-instance = true; window-decoration = "client";