bash ~ zsh wip

This commit is contained in:
2025-09-29 21:52:02 -06:00
parent ba8d491cf7
commit 0beab15f24
7 changed files with 136 additions and 65 deletions

View File

@@ -5,6 +5,9 @@
inputs,
...
}:
let
shellType = config.my.shell.type;
in
{
options.my.shell.tools.enable = lib.mkEnableOption "shell tools and utilities";
config = lib.mkIf config.my.shell.tools.enable {
@@ -16,15 +19,10 @@
};
zoxide = {
enable = true;
enableBashIntegration = true;
enableBashIntegration = shellType == "bash";
enableZshIntegration = shellType == "zsh";
};
bash = {
initExtra = ''
if command -v fzf-share >/dev/null; then
source "$(fzf-share)/key-bindings.bash"
source "$(fzf-share)/completion.bash"
fi
'';
${shellType} = {
shellAliases = {
cd = "z";
hh = "hstr";
@@ -37,7 +35,27 @@
tr '[:upper:]' '[:lower:]' | sort |
uniq --count | sort -rn'';
};
};
}
// (
if shellType == "bash" then
{
initExtra = ''
if command -v fzf-share >/dev/null; then
source "$(fzf-share)/key-bindings.bash"
source "$(fzf-share)/completion.bash"
fi
'';
}
else
{
initContent = ''
if command -v fzf-share >/dev/null; then
source "$(fzf-share)/key-bindings.bash"
source "$(fzf-share)/completion.bash"
fi
'';
}
);
bat = {
enable = true;
config.pager = "less -FR";