Compare commits
3 commits
3633e3995c
...
735477e1ed
| Author | SHA1 | Date | |
|---|---|---|---|
| 735477e1ed | |||
| e78750f8cf | |||
| 64ed5ca881 |
5 changed files with 34 additions and 3 deletions
6
flake.lock
generated
6
flake.lock
generated
|
|
@ -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": {
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ in
|
||||||
wget
|
wget
|
||||||
ssh-tresor
|
ssh-tresor
|
||||||
starship
|
starship
|
||||||
|
wezterm
|
||||||
];
|
];
|
||||||
shells = [
|
shells = [
|
||||||
pkgs.fish
|
pkgs.fish
|
||||||
|
|
|
||||||
19
modules/darwin/tools/wezterm/default.nix
Normal file
19
modules/darwin/tools/wezterm/default.nix
Normal 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 ];
|
||||||
|
};
|
||||||
|
}
|
||||||
10
overlays/inetutils-darwin-fix/default.nix
Normal file
10
overlays/inetutils-darwin-fix/default.nix
Normal 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" ];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue