From c18f70fab0354fb273d9dac12c66e37dbce5d41e Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Sun, 1 Dec 2024 19:20:52 +0000 Subject: [PATCH] Add ghostty --- flake.lock | 101 ++++++++++++++++++++++--- flake.nix | 10 +++ hosts/common/default.nix | 1 + users/configs/desktop/sway/default.nix | 5 +- users/daniel/default.nix | 3 + 5 files changed, 109 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index eeb1807..9fe53c0 100644 --- a/flake.lock +++ b/flake.lock @@ -311,6 +311,24 @@ "inputs": { "systems": "systems_3" }, + "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_4": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1709126324, "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", @@ -325,7 +343,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1649676176, "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", @@ -340,7 +358,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -355,9 +373,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -373,6 +391,30 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "nixpkgs-stable": [ + "nixpkgs" + ], + "nixpkgs-unstable": [ + "nixpkgs" + ], + "zig": "zig" + }, + "locked": { + "lastModified": 1732920523, + "narHash": "sha256-/Udch6RRLBSjluDXjQHWpiYFFJR15g+qV263ibVBwoc=", + "ref": "refs/heads/main", + "rev": "3c637a2777885dab9f8bb9d2b7c36411d62e1e4c", + "revCount": 8136, + "type": "git", + "url": "ssh://git@github.com/ghostty-org/ghostty" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/ghostty-org/ghostty" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -397,7 +439,7 @@ }, "golink": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -460,7 +502,7 @@ }, "i3utils": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ] @@ -611,7 +653,7 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -867,12 +909,13 @@ "inputs": { "agenix": "agenix", "devenv": "devenv", + "ghostty": "ghostty", "golink": "golink", "home-manager": "home-manager_2", "i3utils": "i3utils", "nixgl": "nixgl", "nixpkgs": "nixpkgs_3", - "zig": "zig" + "zig": "zig_2" } }, "systems": { @@ -935,10 +978,50 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils_3", + "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" + } + }, + "zig_2": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_4" }, "locked": { diff --git a/flake.nix b/flake.nix index 43d10e8..ec7911e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,12 @@ devenv.url = "github:cachix/devenv"; devenv.inputs.nixpkgs.follows = "nixpkgs"; + ghostty = { + url = "git+ssh://git@github.com/ghostty-org/ghostty"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + inputs.nixpkgs-unstable.follows = "nixpkgs"; + }; + golink.url = "github:tailscale/golink"; golink.inputs.nixpkgs.follows = "nixpkgs"; @@ -29,6 +35,7 @@ nixpkgs, agenix, devenv, + ghostty, golink, home-manager, i3utils, @@ -46,6 +53,9 @@ golink.overlay nixgl.overlay zig.overlays.default + (final: prev: { + ghostty = ghostty.packages.${system}.default; + }) ]; config.permittedInsecurePackages = [ "electron-25.9.0" diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 3ee0f2a..e9e5e65 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -78,6 +78,7 @@ in { firefox fzf gcc + ghostty git htop helix diff --git a/users/configs/desktop/sway/default.nix b/users/configs/desktop/sway/default.nix index 94eb51b..c005167 100644 --- a/users/configs/desktop/sway/default.nix +++ b/users/configs/desktop/sway/default.nix @@ -49,11 +49,12 @@ in { scale = "1.33"; }; }; + modifier = mod; keybindings = { - "${mod}+Return" = "exec wezterm"; + "${mod}+Return" = "exec ghostty"; "${mod}+q" = "kill"; "${mod}+d" = "exec tofi-drun --drun-launch=true"; - "${hyper}+Return" = "exec wezterm"; + "${hyper}+Return" = "exec ghostty"; "${hyper}+q" = "kill"; "${hyper}+d" = "exec tofi-drun --drun-launch=true"; diff --git a/users/daniel/default.nix b/users/daniel/default.nix index d4c1452..3c5f03e 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -57,9 +57,12 @@ guiPackages = with pkgs; [ _1password _1password-gui + calibre discord feh fraunces + ghostty + gimp grim iosevka idea