SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 22:11:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restructure the shell module for better readability

Browse source
This commit is contained in:
SebastianStork 2024-03-25 17:52:32 +01:00
parent 8fd578e573
commit 2ea784c007
1 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/home/shell.nix
View file

@ -14,7 +14,8 @@ in {
direnv.enable = lib.mkEnableOption ""; direnv.enable = lib.mkEnableOption "";
}; };
config = { config = lib.mkMerge [
{
programs.bash.enable = cfg.bash.enable; programs.bash.enable = cfg.bash.enable;
programs.zsh.enable = cfg.zsh.enable; programs.zsh.enable = cfg.zsh.enable;
@ -33,8 +34,15 @@ in {
}; };
}; };
home.shellAliases = let programs.direnv = lib.mkIf cfg.direnv.enable {
nixAliases = lib.mkIf cfg.nixAliases.enable { enable = true;
nix-direnv.enable = true;
config.global.hide_env_diff = true;
};
}
(lib.mkIf cfg.nixAliases.enable {
home.shellAliases = {
nr = "sudo nixos-rebuild --flake $FLAKE"; nr = "sudo nixos-rebuild --flake $FLAKE";
nrs = "nr switch"; nrs = "nr switch";
nrt = "nr test"; nrt = "nr test";
@ -42,30 +50,23 @@ in {
nrrb = "nrb && reboot"; nrrb = "nrb && reboot";
nu = "sudo nix flake update"; nu = "sudo nix flake update";
}; };
commandAliases = lib.mkIf cfg.improvedCommands.enable { })
cat = "bat -p";
};
in
lib.mkMerge [nixAliases commandAliases];
programs.lsd = lib.mkIf cfg.improvedCommands.enable { (lib.mkIf cfg.improvedCommands.enable {
programs.lsd = {
enable = true; enable = true;
enableAliases = true; enableAliases = true;
}; };
programs.bat.enable = cfg.improvedCommands.enable; programs.bat.enable = true;
home.shellAliases.cat = "bat -p";
programs.fzf.enable = cfg.improvedCommands.enable; programs.fzf.enable = true;
programs.zoxide = lib.mkIf cfg.improvedCommands.enable { programs.zoxide = {
enable = true; enable = true;
options = ["--cmd cd"]; options = ["--cmd cd"];
}; };
})
programs.direnv = lib.mkIf cfg.direnv.enable { ];
enable = true;
nix-direnv.enable = true;
config.global.hide_env_diff = true;
};
};
} }