diff --git a/flake.nix b/flake.nix index 2541065..417b862 100644 --- a/flake.nix +++ b/flake.nix @@ -43,22 +43,21 @@ }; outputs = - inputs@{ - nixpkgs, - nixpkgsUnstable, - home-manager, - home-manager-darwin, - nix-darwin, - mac-app-util, - nix-flatpak, - ... + inputs@{ nixpkgs + , nixpkgsUnstable + , home-manager + , home-manager-darwin + , nix-darwin + , mac-app-util + , nix-flatpak + , ... }: let linuxSystem = "x86_64-linux"; darwinSystem = "aarch64-darwin"; mkOverlays = sys: [ inputs.nix-vscode-extensions.overlays.default - (final: prev: { + (_final: _prev: { unstable = import nixpkgsUnstable { system = sys; config.allowUnfree = true; @@ -102,6 +101,7 @@ nixpkgs.overlays = mkOverlays darwinSystem; nixpkgs.config.allowUnfree = true; } + ./shared.darwin.nix ./cleo.darwin.nix mac-app-util.darwinModules.default ]; @@ -118,6 +118,7 @@ nixpkgs.overlays = mkOverlays darwinSystem; nixpkgs.config.allowUnfree = true; } + ./shared.darwin.nix ./hydrogen.darwin.nix mac-app-util.darwinModules.default ]; diff --git a/home.shared.nix b/home.shared.nix index 549ad91..4f3a820 100644 --- a/home.shared.nix +++ b/home.shared.nix @@ -26,6 +26,7 @@ in treefmt nixpkgs-fmt deadnix + ghostty.terminfo ]; xdg.enable = true; diff --git a/shared.darwin.nix b/shared.darwin.nix new file mode 100644 index 0000000..7de1de8 --- /dev/null +++ b/shared.darwin.nix @@ -0,0 +1,5 @@ +{ + security.sudo.extraConfig = '' + Defaults env_keep += "TERMINFO" + ''; +}