From 987b11ffc1bb58d0675390aae43bbf9ac9e166b7 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sat, 21 Mar 2026 15:49:17 +0100 Subject: [PATCH] Modules/Fish: Add nix-darwin homebrew environment setup --- home/homemodules/fish/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/home/homemodules/fish/default.nix b/home/homemodules/fish/default.nix index 487b079a..26a0af33 100644 --- a/home/homemodules/fish/default.nix +++ b/home/homemodules/fish/default.nix @@ -45,6 +45,18 @@ in { programs.fish = lib.mkMerge [ # Darwin exclusive config (lib.mkIf pkgs.stdenv.isDarwin { + shellInit = '' + set fish_greeting + yes | fish_config theme save "system-theme" + + set --global --export HOMEBREW_PREFIX "/opt/homebrew" + set --global --export HOMEBREW_CELLAR "/opt/homebrew/Cellar" + set --global --export HOMEBREW_REPOSITORY "/opt/homebrew" + fish_add_path --global --move --path "/opt/homebrew/bin" "/opt/homebrew/sbin" + if test -n "$MANPATH[1]"; set --global --export MANPATH ''' $MANPATH; end; + if not contains "/opt/homebrew/share/info" $INFOPATH; set --global --export INFOPATH "/opt/homebrew/share/info" $INFOPATH; end; + ''; + shellAbbrs = let # These can be used for my config.homemodules and for HM config.programs, # as both of these add the package to home.packages @@ -66,6 +78,11 @@ in { (lib.mkIf pkgs.stdenv.isLinux { generateCompletions = nixosConfig.programs.fish.generateCompletions; + shellInit = '' + set fish_greeting + yes | fish_config theme save "system-theme" + ''; + functions = lib.mergeAttrsList [ (lib.optionalAttrs config.homemodules.nnn.enable { nnncd = { @@ -228,11 +245,6 @@ in { ]; plugins = []; - - shellInit = '' - set fish_greeting - yes | fish_config theme save "system-theme" - ''; } ];