From 94d7a6a5f861ec86db7e7b7bd93ea9c7c4f110ab Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Wed, 31 Jul 2024 11:40:30 -0400 Subject: [PATCH] feat(wezterm): Switch to wezterm nightly --- flake.lock | 153 ++++++++++++++++++++++++++++++- flake.nix | 4 + home-manager/modules/wezterm.nix | 6 +- 3 files changed, 161 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 627811a4..7b44ad7a 100644 --- a/flake.lock +++ b/flake.lock @@ -246,6 +246,41 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "freetype2": { + "flake": false, + "locked": { + "lastModified": 1687587065, + "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + }, + "original": { + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -317,6 +352,23 @@ "type": "github" } }, + "harfbuzz": { + "flake": false, + "locked": { + "lastModified": 1711722720, + "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", + "owner": "harfbuzz", + "repo": "harfbuzz", + "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", + "type": "github" + }, + "original": { + "owner": "harfbuzz", + "ref": "8.4.0", + "repo": "harfbuzz", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -380,6 +432,23 @@ "type": "github" } }, + "libpng": { + "flake": false, + "locked": { + "lastModified": 1549245649, + "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + }, + "original": { + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + } + }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_3", @@ -499,7 +568,29 @@ "home-manager": "home-manager_2", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_2", - "tokyonight": "tokyonight" + "tokyonight": "tokyonight", + "wezterm-nightly": "wezterm-nightly" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "wezterm-nightly", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721441897, + "narHash": "sha256-gYGX9/22tPNeF7dR6bWN5rsrpU4d06GnQNNgZ6ZiXz0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { @@ -547,6 +638,21 @@ "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" + } + }, "tokyonight": { "inputs": { "tokyonight": "tokyonight_2", @@ -597,6 +703,51 @@ "repo": "tokyonight.nvim", "type": "github" } + }, + "wezterm-nightly": { + "inputs": { + "flake-utils": "flake-utils_3", + "freetype2": "freetype2", + "harfbuzz": "harfbuzz", + "libpng": "libpng", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay", + "zlib": "zlib" + }, + "locked": { + "dir": "nix", + "lastModified": 1722353247, + "narHash": "sha256-pPH+IJ8pljR+PmeOdckoHvbQVfSBdStKbgXcaqdkTRk=", + "owner": "wez", + "repo": "wezterm", + "rev": "56a27e93a9ee50aab50ff4d78308f9b3154b5122", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "wez", + "repo": "wezterm", + "type": "github" + } + }, + "zlib": { + "flake": false, + "locked": { + "lastModified": 1484501380, + "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", + "owner": "madler", + "repo": "zlib", + "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", + "type": "github" + }, + "original": { + "owner": "madler", + "ref": "v1.2.11", + "repo": "zlib", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1ab790d6..406dc17d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,10 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; catppuccin.url = "github:catppuccin/nix"; tokyonight.url = "github:mrjones2014/tokyonight.nix"; + wezterm-nightly = { + url = "github:wez/wezterm?dir=nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/modules/wezterm.nix b/home-manager/modules/wezterm.nix index 2bbfb273..1da50432 100644 --- a/home-manager/modules/wezterm.nix +++ b/home-manager/modules/wezterm.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, inputs, isLinux, ... }: let fish_path_lua_str = "'${pkgs.fish}/bin/fish'"; in { home = { @@ -7,6 +7,10 @@ in { }; programs.wezterm = { enable = true; + package = if isLinux then + inputs.wezterm-nightly.packages.x86_64-linux.default + else + inputs.wezterm-nightly.packages.aarch64-darwin.default; extraConfig = '' local wezterm = require('wezterm') local config = wezterm.config_builder()