From 2c3b2d21a46ceafbfb4d65d189afbf8868e32d3d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 6 Jan 2025 11:04:04 +0000 Subject: [PATCH] flake.nix: use wezterm from nixpkgs --- flake.lock | 120 ----------------------- flake.nix | 7 -- modules/home-manager/desktop/wezterm.nix | 2 - 3 files changed, 129 deletions(-) diff --git a/flake.lock b/flake.lock index 2062664e..88824fb0 100644 --- a/flake.lock +++ b/flake.lock @@ -105,23 +105,6 @@ "type": "github" } }, - "freetype2": { - "flake": false, - "locked": { - "lastModified": 1723459814, - "narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=", - "owner": "freetype", - "repo": "freetype", - "rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5", - "type": "github" - }, - "original": { - "owner": "freetype", - "ref": "VER-2-13-3", - "repo": "freetype", - "type": "github" - } - }, "hardware": { "locked": { "lastModified": 1735388221, @@ -137,23 +120,6 @@ "type": "github" } }, - "harfbuzz": { - "flake": false, - "locked": { - "lastModified": 1719502711, - "narHash": "sha256-2ieCf3ftNk851FZBDPVl+7QHWBqD729KiUxUyxi26Yg=", - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "9c03576c49db6e7207d9bcdfe3abd170a809157f", - "type": "github" - }, - "original": { - "owner": "harfbuzz", - "ref": "9.0.0", - "repo": "harfbuzz", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -210,23 +176,6 @@ "type": "github" } }, - "libpng": { - "flake": false, - "locked": { - "lastModified": 1726173884, - "narHash": "sha256-gBfHgGaqVYdmhWXoNKZzPyGzyw2rr3zp+DjWmfC41jk=", - "owner": "pnggroup", - "repo": "libpng", - "rev": "f5e92d76973a7a53f517579bc95d61483bf108c0", - "type": "github" - }, - "original": { - "owner": "pnggroup", - "ref": "v1.6.44", - "repo": "libpng", - "type": "github" - } - }, "nix-alien": { "inputs": { "flake-compat": [ @@ -370,7 +319,6 @@ ], "nixgl": "nixgl", "nixpkgs": "nixpkgs", - "wezterm": "wezterm", "yazi-flavors": "yazi-flavors", "zim-completion": "zim-completion", "zim-environment": "zim-environment", @@ -380,27 +328,6 @@ "zsh-completions": "zsh-completions" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735871325, - "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a599f011db521766cbaf7c2f5874182485554f00", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -416,36 +343,6 @@ "type": "github" } }, - "wezterm": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay", - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1735931735, - "narHash": "sha256-4wzEN5IPYmqLP8TAdFatoRhCZ7W9y65AWoYN0Qgvbg8=", - "owner": "wez", - "repo": "wezterm", - "rev": "8e9cf912e66f704f300fac6107206a75036de1e7", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "wez", - "repo": "wezterm", - "type": "github" - } - }, "yazi-flavors": { "flake": false, "locked": { @@ -526,23 +423,6 @@ "type": "github" } }, - "zlib": { - "flake": false, - "locked": { - "lastModified": 1705948357, - "narHash": "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=", - "owner": "madler", - "repo": "zlib", - "rev": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf", - "type": "github" - }, - "original": { - "owner": "madler", - "ref": "v1.3.1", - "repo": "zlib", - "type": "github" - } - }, "zsh-autopair": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1d0e018c..20f14e2f 100644 --- a/flake.nix +++ b/flake.nix @@ -70,13 +70,6 @@ flake = false; }; - # wezterm - wezterm = { - url = "github:wez/wezterm?dir=nix"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # ZSH plugins zim-completion = { url = "github:zimfw/completion"; diff --git a/modules/home-manager/desktop/wezterm.nix b/modules/home-manager/desktop/wezterm.nix index 2a4a42bd..31a65add 100644 --- a/modules/home-manager/desktop/wezterm.nix +++ b/modules/home-manager/desktop/wezterm.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - flake, ... }: @@ -38,7 +37,6 @@ in programs = { wezterm = { enable = true; - package = flake.inputs.wezterm.packages.${pkgs.system}.default; extraConfig = let inherit (config.home-manager.desktop.theme) fonts colors;