Compare commits

..

3 commits

Author SHA1 Message Date
735477e1ed chore: update flake.lock
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-14 09:17:56 +01:00
e78750f8cf fix(darwin): work around inetutils 2.7 build failure on macOS
gnulib's error.h macros cause compilation errors with newer Clang due
to __VA_ARGS__ handling and -Wformat-security. Disable format hardening
and suppress -Werror to allow inetutils to build on Darwin.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-14 09:17:33 +01:00
64ed5ca881 feat(nix): enable WezTerm support on Darwin systems
- Added a module to configure WezTerm with an enable option and system package inclusion.
- Enabled WezTerm for aarch64-darwin systems and updated base system packages.
- Improves terminal experience by integrating WezTerm into the Darwin configurations.
2026-02-13 19:44:31 +01:00
5 changed files with 34 additions and 3 deletions

6
flake.lock generated
View file

@ -642,11 +642,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1770617025, "lastModified": 1770770419,
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -39,6 +39,7 @@ in
wget wget
ssh-tresor ssh-tresor
starship starship
wezterm
]; ];
shells = [ shells = [
pkgs.fish pkgs.fish

View file

@ -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 ];
};
}

View file

@ -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" ];
});
}

View file

@ -30,6 +30,7 @@ with lib.metacfg;
tools = { tools = {
direnv.enable = true; direnv.enable = true;
alacritty.enable = true; alacritty.enable = true;
wezterm.enable = true;
}; };
build.enable = true; build.enable = true;
}; };