diff --git a/flake.lock b/flake.lock index a1809b7..2d1c33a 100644 --- a/flake.lock +++ b/flake.lock @@ -642,11 +642,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770617025, - "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { diff --git a/modules/darwin/services/base/default.nix b/modules/darwin/services/base/default.nix index 84c8f08..7596aa5 100644 --- a/modules/darwin/services/base/default.nix +++ b/modules/darwin/services/base/default.nix @@ -39,6 +39,7 @@ in wget ssh-tresor starship + wezterm ]; shells = [ pkgs.fish diff --git a/modules/darwin/tools/wezterm/default.nix b/modules/darwin/tools/wezterm/default.nix new file mode 100644 index 0000000..33178d4 --- /dev/null +++ b/modules/darwin/tools/wezterm/default.nix @@ -0,0 +1,19 @@ +{ lib +, config +, pkgs +, ... +}: +let + inherit (lib) mkEnableOption mkIf; + + cfg = config.metacfg.tools.wezterm; +in +{ + options.metacfg.tools.wezterm = { + enable = mkEnableOption "wezterm"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ wezterm ]; + }; +} diff --git a/overlays/inetutils-darwin-fix/default.nix b/overlays/inetutils-darwin-fix/default.nix new file mode 100644 index 0000000..b86d0af --- /dev/null +++ b/overlays/inetutils-darwin-fix/default.nix @@ -0,0 +1,10 @@ +{ ... }: +final: prev: { + inetutils = prev.inetutils.overrideAttrs (old: { + # Fix gnulib variadic macro error on Darwin with newer Clang + # The error.h macro __gl_error_call1 has issues with __VA_ARGS__ + # and -Werror,-Wformat-security causes build failures + NIX_CFLAGS_COMPILE = (old.NIX_CFLAGS_COMPILE or "") + " -Wno-error"; + hardeningDisable = (old.hardeningDisable or [ ]) ++ [ "format" ]; + }); +} diff --git a/systems/aarch64-darwin/m4/default.nix b/systems/aarch64-darwin/m4/default.nix index 16f6052..d840cec 100644 --- a/systems/aarch64-darwin/m4/default.nix +++ b/systems/aarch64-darwin/m4/default.nix @@ -30,6 +30,7 @@ with lib.metacfg; tools = { direnv.enable = true; alacritty.enable = true; + wezterm.enable = true; }; build.enable = true; };