diff --git a/README.md b/README.md index db7a4fe..b59e4b2 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ If you bring a work NixOS machine into your fleet, you can use the same `m3ta-ho This gives you: -- Your familiar shell setup (fish, starship, nushell) +- Your familiar shell setup (starship, nushell) - Your CLI tools (fzf, bat, eza, zoxide, etc.) - Your editor configs (neovim, zed) - Work git identity and SSH configuration automatically @@ -162,7 +162,6 @@ Every module in m3ta-home has an `enable` option. Base modules default to `true` ``` base.cliTools.ansible.enable # Ansible (config rollout to servers) -base.shell.fish.enable # Fish shell base.shell.nushell.enable # Nushell base.shell.starship.enable # Starship prompt base.cliTools.fzf.enable # Fuzzy finder diff --git a/profiles/base/cli-tools/carapace.nix b/profiles/base/cli-tools/carapace.nix index ea9194e..b1602d6 100644 --- a/profiles/base/cli-tools/carapace.nix +++ b/profiles/base/cli-tools/carapace.nix @@ -1,4 +1,4 @@ -# Carapace — multi-shell completion engine with Fish, Nushell, and Bash integration. +# Carapace — multi-shell completion engine with Nushell and Bash integration. { config, lib, @@ -13,7 +13,6 @@ in { config = mkIf cfg.enable { programs.carapace = { enable = true; - enableFishIntegration = true; enableNushellIntegration = true; enableBashIntegration = true; }; diff --git a/profiles/base/cli-tools/eza.nix b/profiles/base/cli-tools/eza.nix index 2e432a8..7ea3ee9 100644 --- a/profiles/base/cli-tools/eza.nix +++ b/profiles/base/cli-tools/eza.nix @@ -13,7 +13,6 @@ in { config = mkIf cfg.enable { programs.eza = { enable = true; - enableFishIntegration = true; enableBashIntegration = true; extraOptions = ["-l" "--icons" "--git" "-a"]; }; diff --git a/profiles/base/cli-tools/fzf.nix b/profiles/base/cli-tools/fzf.nix index dd0d351..2497d41 100644 --- a/profiles/base/cli-tools/fzf.nix +++ b/profiles/base/cli-tools/fzf.nix @@ -16,7 +16,6 @@ in { programs.fzf = { enable = true; - enableFishIntegration = true; colors = { "fg" = "#${config.colorScheme.palette.base05}"; "bg" = "#${config.colorScheme.palette.base00}"; diff --git a/profiles/base/cli-tools/nix-index.nix b/profiles/base/cli-tools/nix-index.nix index ef6da41..9992b70 100644 --- a/profiles/base/cli-tools/nix-index.nix +++ b/profiles/base/cli-tools/nix-index.nix @@ -17,7 +17,6 @@ in { programs.nix-index = { enable = true; enableBashIntegration = true; - enableFishIntegration = true; enableNushellIntegration = true; }; }; diff --git a/profiles/base/cli-tools/zoxide.nix b/profiles/base/cli-tools/zoxide.nix index bc3e80e..f840af7 100644 --- a/profiles/base/cli-tools/zoxide.nix +++ b/profiles/base/cli-tools/zoxide.nix @@ -1,4 +1,4 @@ -# Zoxide — smarter cd with Fish and Nushell integration. +# Zoxide — smarter cd with Nushell integration. { config, lib, @@ -13,7 +13,6 @@ in { config = mkIf cfg.enable { programs.zoxide = { enable = true; - enableFishIntegration = true; enableNushellIntegration = true; }; }; diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 34ae9b5..006d2dd 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -1,7 +1,7 @@ # profiles/base/default.nix — Always loaded on every host. # # Provides: -# - Shell (nushell, fish, starship) with enable options +# - Shell (nushell, starship) with enable options # - CLI tools (bat, carapace, direnv, eza, fzf, lf, nitch, television, zellij, zoxide) # - Secrets management (pass-wayland) # - Color scheme (dracula) diff --git a/profiles/base/shell/default.nix b/profiles/base/shell/default.nix index 0b02d43..e87d790 100644 --- a/profiles/base/shell/default.nix +++ b/profiles/base/shell/default.nix @@ -1,4 +1,4 @@ -# Shell aggregator — imports Nushell (primary), Fish, and Starship prompt. +# Shell aggregator — imports Nushell and Starship prompt. {...}: { imports = [ ./nushell.nix diff --git a/profiles/base/shell/fish.nix b/profiles/base/shell/fish.nix index 6c6e3ad..66a5812 100644 --- a/profiles/base/shell/fish.nix +++ b/profiles/base/shell/fish.nix @@ -1,118 +1,16 @@ -# Fish shell configuration exposed under the new base namespace. +# Deprecated: Fish was removed in favour of Nushell. The option stays as a no-op +# so configs that still set it keep evaluating; delete once none do. { config, lib, ... -}: -with lib; let - cfg = config.base.shell.fish; -in { - # Enabled by default — base modules are always-on. - options.base.shell.fish.enable = (mkEnableOption "enable fish shell") // {default = true;}; - - config = mkIf cfg.enable { - programs.fish = { - enable = true; - interactiveShellInit = '' - # Fish colors using universal nix-colors palette - # Text colors - set -g fish_color_normal ${config.colorScheme.palette.base05} # text - set -g fish_color_param ${config.colorScheme.palette.base05} # text - set -g fish_color_comment ${config.colorScheme.palette.base03} # muted - set -g fish_color_autosuggestion ${config.colorScheme.palette.base03} # muted - - # Command colors - set -g fish_color_command ${config.colorScheme.palette.base0D} # accent6 (blue) - set -g fish_color_quote ${config.colorScheme.palette.base0A} # accent3 (yellow) - set -g fish_color_redirection ${config.colorScheme.palette.base0E} # accent7 (purple) - set -g fish_color_end ${config.colorScheme.palette.base08} # accent1 (red) - set -g fish_color_error ${config.colorScheme.palette.base08} # accent1 (red) - set -g fish_color_operator ${config.colorScheme.palette.base0C} # accent5 (cyan) - set -g fish_color_escape ${config.colorScheme.palette.base09} # accent2 (orange) - - # Path colors - set -g fish_color_cwd ${config.colorScheme.palette.base0B} # accent4 (green) - set -g fish_color_cwd_root ${config.colorScheme.palette.base08} # accent1 (red) - set -g fish_color_valid_path --underline - - # Interactive colors - set -g fish_color_match ${config.colorScheme.palette.base0B} # accent4 (green) - set -g fish_color_selection --background=${config.colorScheme.palette.base02} # overlay - set -g fish_color_search_match --background=${config.colorScheme.palette.base02} # overlay - set -g fish_color_history_current --bold - set -g fish_color_user ${config.colorScheme.palette.base0B} # accent4 (green) - set -g fish_color_host ${config.colorScheme.palette.base0D} # accent6 (blue) - set -g fish_color_cancel -r - - # Pager colors - set -g fish_pager_color_completion normal - set -g fish_pager_color_description ${config.colorScheme.palette.base03} # muted - set -g fish_pager_color_prefix ${config.colorScheme.palette.base0E} # accent7 (purple) - set -g fish_pager_color_progress ${config.colorScheme.palette.base0B} # accent4 (green) - ''; - loginShellInit = '' - set -x NIX_PATH nixpkgs=channel:nixos-unstable - set -x NIX_LOG info - set -x WEBKIT_DISABLE_COMPOSITING_MODE 1 - set -x TERMINAL ghostty - set -x EDITOR nvim - set -x VISUAL zed - set -x XDG_DATA_HOME $HOME/.local/share - set -x FZF_CTRL_R_OPTS " - --preview='bat --color=always -n {}' - --preview-window up:3:hidden:wrap - --bind 'ctrl-/:toggle-preview' - --bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort' - --color header:bold - --header 'Press CTRL-Y to copy command into clipboard'" - set -x FZF_DEFAULT_COMMAND fd --type f --exclude .git --follow --hidden - set -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND" - set -x FLAKE $HOME/p/nixos/nixos-config - source /run/agenix/${config.home.username}-secrets - - if test (tty) = "/dev/tty1" - exec uwsm start -F /run/current-system/sw/bin/Hyprland - end - if test (tty) = "/dev/tty2" - exec gamescope -O HDMI-A-1 -W 1920 -H 1080 --adaptive-sync --hdr-enabled --rt --steam -- steam -pipewire-dmabuf -tenfoot - end - ''; - shellAbbrs = { - ".." = "cd .."; - "..." = "cd ../.."; - b = "yazi"; - ls = "eza"; - l = "eza -l --icons --git -a"; - lt = "eza --tree --level=2 --long --icons --git"; - grep = "rg"; - ps = "procs"; - just = "just --unstable"; - node = "bun"; - npx = "bunx"; - fs = "du -ah . | sort -hr | head -n 10"; - - n = "nix"; - nd = "nix develop -c $SHELL"; - ns = "nix shell"; - nsn = "nix shell nixpkgs#"; - nb = "nix build"; - nbn = "nix build nixpkgs#"; - nf = "nix flake"; - - nr = "sudo nixos-rebuild --flake ."; - nrs = "sudo nixos-rebuild switch --flake .#(uname -n)"; - snr = "sudo nixos-rebuild --flake ."; - snrs = "sudo nixos-rebuild --flake . switch"; - hm = "home-manager --flake ."; - hms = "home-manager --flake . switch"; - hmr = "cd ~/projects/nix-configurations; nix flake lock --update-input dotfiles; home-manager --flake .#(whoami)@(hostname) switch"; - - tsu = "sudo tailscale up"; - tsd = "sudo tailscale down"; - - vi = "nvim"; - vim = "nvim"; - }; - }; +}: { + options.base.shell.fish.enable = lib.mkOption { + type = lib.types.bool; + default = false; + visible = false; + description = "Deprecated no-op. Fish is no longer configured by m3ta-home."; }; + + config.warnings = lib.optional config.base.shell.fish.enable "base.shell.fish.enable has no effect anymore: Fish was removed from m3ta-home. Drop the setting."; } diff --git a/profiles/base/shell/starship.nix b/profiles/base/shell/starship.nix index 5d467d6..5d0c48c 100644 --- a/profiles/base/shell/starship.nix +++ b/profiles/base/shell/starship.nix @@ -13,7 +13,6 @@ in { config = mkIf cfg.enable { programs.starship = { enable = true; - enableFishIntegration = true; enableNushellIntegration = true; settings = { format = "$all$character"; diff --git a/profiles/contexts/desktop/default.nix b/profiles/contexts/desktop/default.nix index 8358aff..4605523 100644 --- a/profiles/contexts/desktop/default.nix +++ b/profiles/contexts/desktop/default.nix @@ -94,7 +94,6 @@ programs.ghostty = { enable = true; - enableFishIntegration = true; enableBashIntegration = true; settings = { font-family = "Fira Code";