From 407cc29485b010e2aa016f7b630f091e55472b2d Mon Sep 17 00:00:00 2001 From: b3nj5m1n Date: Sat, 28 Dec 2024 20:57:28 +0100 Subject: [PATCH] Add ghostty --- flake.lock | 140 +++++++++++++++++++++++++++++++++++++-- flake.nix | 7 ++ nix/nixos/emperor.nix | 1 + nix/overlays/default.nix | 2 + nix/pkgs/default.nix | 2 + 5 files changed, 146 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 4a5585d..ca9e4ce 100644 --- a/flake.lock +++ b/flake.lock @@ -131,6 +131,22 @@ } }, "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": 1717312683, @@ -205,6 +221,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "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_3": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -219,6 +253,27 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat_2", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1735362327, + "narHash": "sha256-kD49xAUMCWU60IRKoJiyJTaEUum7rk45OYjZfwWr3Ck=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "6cbd69da7839260508466f9dfb2bc0c0fbb43991", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": [ @@ -347,7 +402,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_8", - "systems": "systems_2", + "systems": "systems_3", "xdph": "xdph" }, "locked": { @@ -539,11 +594,11 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -621,6 +676,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1731797254, "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", @@ -636,7 +707,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1732365056, "narHash": "sha256-4atyzzvvP3P8ehe8hA02W9ODd/4M1KXoMxr9mZyIi5I=", @@ -652,6 +723,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1725103162, @@ -795,7 +882,7 @@ }, "pfui": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "naersk": "naersk", "nixpkgs": "nixpkgs_4" }, @@ -818,11 +905,12 @@ "dwarffs": "dwarffs", "fenix": "fenix", "flake-utils": "flake-utils", + "ghostty": "ghostty", "hardware": "hardware", "home-manager": "home-manager", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable_3", "pfui": "pfui", "sops-nix": "sops-nix", "xremap-flake": "xremap-flake" @@ -900,6 +988,21 @@ } }, "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": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1006,6 +1109,31 @@ "repo": "nix-flake", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils_2", + "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 3635071..62ebbc2 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,10 @@ url = "github:lilyinstarlight/nixos-cosmic"; inputs.nixpkgs.follows = "nixpkgs"; }; + + ghostty = { + url = "github:ghostty-org/ghostty"; + }; }; outputs = { @@ -48,6 +52,7 @@ dwarffs, pfui, nixos-cosmic, + ghostty, ... } @ inputs: let inherit (self) outputs; @@ -69,6 +74,7 @@ inherit system; inherit fenix; inherit pfui; + inherit ghostty; } ); @@ -99,6 +105,7 @@ inherit inputs; inherit fenix; inherit pfui; + inherit ghostty; # inherit hyprland; }; # Reusable nixos modules you might want to export diff --git a/nix/nixos/emperor.nix b/nix/nixos/emperor.nix index b3b4163..f645883 100644 --- a/nix/nixos/emperor.nix +++ b/nix/nixos/emperor.nix @@ -108,6 +108,7 @@ environment.systemPackages = with pkgs; [ pfui + ghostty eisvogel bemoji wofi-calc diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index efd6f86..cb9e30b 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -3,6 +3,7 @@ inputs, fenix, pfui, + ghostty, # hyprland, }: { # This one brings our custom packages from the 'pkgs' directory @@ -12,6 +13,7 @@ system = prev.system; inherit fenix; inherit pfui; + inherit ghostty; }; # This one contains whatever you want to overlay diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index d65f25f..a43d832 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -5,11 +5,13 @@ system, fenix, pfui, + ghostty, }: { # fenix = import fenix {inherit system;}; rust-toolchain = fenix.packages.${system}.stable.toolchain; rust-analyzer-nightly = fenix.packages.${system}.stable.rust-analyzer; pfui = pfui.defaultPackage.${system}; + ghostty = ghostty.packages.${system}.default; eisvogel = pkgs.callPackage ./eisvogel {}; # logseq-wrapped = pkgs.callPackage ./logseq-wrapped {}; # logseq-wrapped = if system == "x86_64-linux" then pkgs.callPackage ./logseq-wrapped {} else null;