Skip to content

fix(shell): set programs.fish.enable when cfg.fish.enable is true #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richen604 merged 9 commits into from
Jul 5, 2025
Merged

fix(shell): set programs.fish.enable when cfg.fish.enable is true #128

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21c8104
fix(shell): set programs.fish.enable when cfg.fish.enable is true
stoutpanda Jul 2, 2025
46a9f87
feat(shell): add conditional fastfetch to fish init
stoutpanda Jul 3, 2025
22b9681
feat(shell): add eza package to fish configuration
stoutpanda Jul 3, 2025
0311d02
feat(shell): migrate fish abbreviations to home manager
stoutpanda Jul 3, 2025
ce1bea7
refactor(shell): clean up duplicate package declarations
stoutpanda Jul 3, 2025
28888dc
fix(fish): remove conflicting config.fish direct copy
stoutpanda Jul 3, 2025
301aa7d
feat(fish): add shell aliases from hyde config
stoutpanda Jul 3, 2025
94b09e1
feat(fish): add starship, pokego, and fastfetch integration
stoutpanda Jul 3, 2025
5381714
feat(fish): disable fish greeting message
stoutpanda Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 58 additions & 7 deletions hydenix/modules/hm/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,18 @@ in
[
fastfetch
]
++ lib.optionals (cfg.zsh.enable || cfg.fish.enable) [
eza
duf
]
++ lib.optionals cfg.zsh.enable [
zsh
eza
oh-my-zsh
zsh-autosuggestions
zsh-syntax-highlighting
duf
]
++ lib.optionals cfg.bash.enable [ bash ]
++ lib.optionals cfg.fish.enable [
fish
duf
]
++ lib.optionals cfg.fish.enable [ fish ]
++ lib.optionals cfg.pokego.enable [ pokego ]
++ lib.optionals cfg.starship.enable [ starship ]
++ lib.optionals cfg.p10k.enable [ zsh-powerlevel10k ];
Expand Down Expand Up @@ -142,6 +141,59 @@ in
'';
};

programs.fish = lib.mkIf cfg.fish.enable {
enable = true;
#reimpementing the HyDE-Project config.fish using home.manager
interactiveShellInit = ''
# Disable greeting
set -g fish_greeting

# Source Hyde configuration
source ${pkgs.hydenix.hyde}/Configs/.config/fish/hyde_config.fish

${lib.optionalString cfg.starship.enable ''
if type -q starship
starship init fish | source
set -gx STARSHIP_CACHE $XDG_CACHE_HOME/starship
set -gx STARSHIP_CONFIG $XDG_CONFIG_HOME/starship/starship.toml
end
''}

# fzf integration
if type -q fzf
fzf --fish | source
end

# Color settings
set fish_pager_color_prefix cyan
set fish_color_autosuggestion brblack

${lib.optionalString cfg.pokego.enable ''
pokego --no-title -r 1,3,6
''}

${lib.optionalString cfg.fastfetch.enable ''
fastfetch --logo-type kitty
''}
'';
shellAliases = {
l = "eza -lh --icons=auto";
ls = "eza -1 --icons=auto";
ll = "eza -lha --icons=auto --sort=name --group-directories-first";
ld = "eza -lhD --icons=auto";
lt = "eza --icons=auto --tree";
vc = "code";
};
shellAbbrs = {
".." = "cd ..";
"..." = "cd ../..";
".3" = "cd ../../..";
".4" = "cd ../../../..";
".5" = "cd ../../../../..";
mkdir = "mkdir -p";
};
};

home.file = lib.mkMerge [
(lib.mkIf cfg.zsh.enable {
# Shell configs
Expand Down Expand Up @@ -261,7 +313,6 @@ in

(lib.mkIf cfg.fish.enable {
# Fish configs
".config/fish/config.fish".source = "${pkgs.hydenix.hyde}/Configs/.config/fish/config.fish";
".config/fish/hyde_config.fish".source = "${pkgs.hydenix.hyde}/Configs/.config/fish/hyde_config.fish";
".config/fish/functions/df.fish".source =
"${pkgs.hydenix.hyde}/Configs/.config/fish/functions/df.fish";
Expand Down