From 2f3661365cc35477605ff0679c86fe20bc353a3d Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Wed, 14 Aug 2024 15:31:42 -0400 Subject: [PATCH] fixup some rust breakages --- nix/home-manager/flake.lock | 145 ++++++++++++++++-- nix/home-manager/flake.nix | 18 ++- nix/home-manager/home.nix | 1 + nix/home-manager/modules/packages/default.nix | 2 +- 4 files changed, 151 insertions(+), 15 deletions(-) diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 73f6da7..7d814d0 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -29,11 +29,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1723530607, - "narHash": "sha256-FaXZZLLDW1D+pj7UgrIslDS8XjMMG3Pus5gAvUYWQS0=", + "lastModified": 1723616992, + "narHash": "sha256-jDHYfEECzFwZm4huz7AbPjlH3jJ4/2ns9PddtFA5XMY=", "owner": "nix-community", "repo": "fenix", - "rev": "296d44c440302980824c5f3b67e477cf0522e0c1", + "rev": "7bad6c7ff73b784a9c7de9147626c8d5d5072809", "type": "github" }, "original": { @@ -60,6 +60,40 @@ "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" + } + }, + "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" + } + }, "haumea": { "inputs": { "nixpkgs": "nixpkgs" @@ -99,6 +133,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" + } + }, "nix-flake-tests": { "locked": { "lastModified": 1677844186, @@ -231,15 +282,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723560828, - "narHash": "sha256-ro7HwspYAl6IO/GdO6K/YY7T9wSA+8hbuMmuHLZ9yJU=", - "owner": "nixOS", + "lastModified": 1723661844, + "narHash": "sha256-XWwdNzOsWPlDVFkQvZKGuzBXBxBwWYzyoDQcbNIkDiA=", + "owner": "anthonycicc", "repo": "nixpkgs", - "rev": "0f10078f7ece7e372bd6f24d6559d7323d4b7037", + "rev": "329ab81c77c782f3ddac34613f1d4aa0db3de3d2", "type": "github" }, "original": { - "owner": "nixOS", + "owner": "anthonycicc", + "ref": "patch-1", "repo": "nixpkgs", "type": "github" } @@ -312,17 +364,18 @@ "nixneovim": "nixneovim", "nixneovimplugins": "nixneovimplugins", "nixpkgs": "nixpkgs_2", + "wezterm": "wezterm", "zjstatus": "zjstatus" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1723473250, - "narHash": "sha256-Ls0e6R4FmGUFXZlUcm6ZQaVNJ4Yj/nua4SSctXIopao=", + "lastModified": 1723561310, + "narHash": "sha256-a3KMMsIDvdo+ClLabh5wfJoa17YTSvy2wDLb8yZCXvc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "32a86cb1dad2b208e8f36f1bb50c2e4806b0371f", + "rev": "78c2bdce860dbd996a8083224d01a96660dd6a15", "type": "github" }, "original": { @@ -333,6 +386,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "wezterm", + "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" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "zjstatus", @@ -368,6 +442,36 @@ "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": 1723525023, + "narHash": "sha256-ZsDJQSUokodwFMP4FIZm2dYojf5iC4F/EeKC5VuQlqY=", + "owner": "wez", + "repo": "wezterm", + "rev": "30345b36d8a00fed347e4df5dadd83915a7693fb", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "wez", + "repo": "wezterm", + "type": "github" + } + }, "zjstatus": { "inputs": { "crane": "crane", @@ -377,7 +481,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1723031177, @@ -392,6 +496,23 @@ "repo": "zjstatus", "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/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index e2428b2..59dd5f6 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -8,7 +8,7 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs = {url = "github:nixOS/nixpkgs";}; + nixpkgs = {url = "github:anthonycicc/nixpkgs/patch-1";}; flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it home-manager = { url = "github:nix-community/home-manager"; @@ -47,9 +47,16 @@ nixpkgs.follows = "nixpkgs"; }; }; + wezterm = { + url = "github:wez/wezterm?dir=nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; }; - outputs = { + outputs = inputs @ { self, nixpkgs, home-manager, @@ -58,6 +65,7 @@ nixneovimplugins, zjstatus, fenix, + wezterm, ... }: let supportedSystems = ["aarch64-darwin" "x86_64-linux"]; @@ -72,6 +80,12 @@ (_final: prev: { zjstatus = zjstatus.packages.${prev.system}.default; }) + (_final: prev: { + wezterm = + if (builtins.hasAttr "wezterm" inputs) + then inputs.wezterm.packages.${prev.system}.default + else prev.wezterm; + }) nixneovimplugins.overlays.default fenix.overlays.default ]; diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix index bee7c99..db5e582 100644 --- a/nix/home-manager/home.nix +++ b/nix/home-manager/home.nix @@ -114,6 +114,7 @@ in { enable = true; enableZshIntegration = true; extraConfig = builtins.readFile ../../wezterm/wezterm.lua; + # package = wezterm.packages.${pkgs.system}.default; }; yazi = { diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index e4bb502..ae7c93f 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -18,7 +18,7 @@ in { home.packages = with pkgs; [ _1password - bandwhich + # bandwhich bat bottom cargo-workspaces