-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add fish shell option, put optional shells
in shared/shells/`
- Move zsh config to `modules/shared/shells/zsh.nix`, add fish config to `modules/shared/shells/fish.nix` - Make each shell optional, add activeShell option definition in `shared/default.nix` for tracking the currently enabled shell. This is set in each shells/ file, then used in programs.nix to enable shell specific integrations with `isZsh` or `isFish`
- Loading branch information
1 parent
70426fc
commit fa33b99
Showing
7 changed files
with
231 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,17 @@ | ||
| { ... }: | ||
| { lib, ... }: | ||
|
|
||
| { | ||
| imports = [ | ||
| ./nix.nix | ||
| ./shells/zsh.nix | ||
| ./shells/fish.nix | ||
| ]; | ||
|
|
||
| options.shells = { | ||
| activeShell = lib.mkOption { | ||
| type = lib.types.enum [ "none" "zsh" "fish" "bash" ]; | ||
| default = "none"; | ||
| description = "Currently active shell"; | ||
| }; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| { pkgs, lib, config, variables, ... }: | ||
| let | ||
| inherit (variables) userName; | ||
| cfg = config.shells.fish; | ||
| in | ||
| { | ||
| # Enable fish with: | ||
| # `shells.fish.enable = true;` | ||
|
|
||
| # Set shell per host in: | ||
| # hosts/<host>/default.nix or modules/<host>/home-manager.nix | ||
|
|
||
| # Set shell for all hosts in: | ||
| # modules/shared/default.nix | ||
|
|
||
| options.shells.fish = { | ||
| enable = lib.mkEnableOption "fish shell"; | ||
| }; | ||
|
|
||
| config = lib.mkIf cfg.enable { | ||
| # Using activeShell, programs can conditionally | ||
| # enable shell specific integrations | ||
| shells.activeShell = "fish"; | ||
|
|
||
| home-manager.users.${userName}.programs.fish = { | ||
| enable = true; | ||
| shellAbbrs = { | ||
| # General aliases | ||
| g = "git"; | ||
| zrc = "nvim ~/.zshrc"; | ||
| szrc = "source ~/.zshrc"; | ||
| exz = "exec zsh"; | ||
| cl = "clear"; | ||
| yz = "yazi"; | ||
| lg = "lazygit"; | ||
| # Nix aliases | ||
| ns = "git add . && nix run .#build-switch"; | ||
| nb = "git add . && nix run .#build"; | ||
| # Eza aliases | ||
| ls = "eza --git --icons=always --color=always --long --no-user --no-permissions --no-filesize --no-time"; | ||
| lsa = "eza --git --icons=always --color=always --long --no-user --no-permissions --no-filesize --no-time --all"; | ||
| lsl = "eza --git --icons=always --color=always --long --no-user"; | ||
| ll = "eza --git --icons=always --color=always --long --no-user -all"; | ||
| lt = "eza --git --icons=always --color=always --long --no-user -all --tree --level=2"; | ||
| lt2 = "eza --git --icons=always --color=always --long --no-user -all --tree --level=3"; | ||
| lt3 = "eza --git --icons=always --color=always --long --no-user -all --tree --level=4"; | ||
| ltg = "eza --git --icons=always --color=always --long --no-user --tree --git-ignore"; | ||
| }; | ||
| }; | ||
|
|
||
| # Set nix managed system shell | ||
| environment.shells = [ pkgs.fish ]; | ||
| programs.fish.enable = true; | ||
|
|
||
| # Make sure nix managed shell is used by default | ||
| users = lib.mkMerge [ | ||
| { | ||
| # Common settings for both platforms | ||
| users.${userName}.shell = pkgs.fish; | ||
| } | ||
| # Darwin-specific settings | ||
| (lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { | ||
| # knownUsers may not be the best way to do this | ||
| # setup nix managed shell in nix-darwin | ||
| # https://github.com/LnL7/nix-darwin/issues/811#issuecomment-2227568956 | ||
| knownUsers = [ userName ]; | ||
| users.${userName}.uid = 501; | ||
| }) | ||
| ]; | ||
| }; | ||
| } |
Oops, something went wrong.