chore(shell): remove Fish configuration #5

Merged
m3ta-chiron merged 1 commits from chore/remove-fish into master 2026-11-02 12:27:45 +01:00
11 changed files with 15 additions and 125 deletions
Showing only changes of commit 396c41d99d - Show all commits

No files matched your search

+1 -2
View File
@@ -142,7 +142,7 @@ If you bring a work NixOS machine into your fleet, you can use the same `m3ta-ho
This gives you: 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 CLI tools (fzf, bat, eza, zoxide, etc.)
- Your editor configs (neovim, zed) - Your editor configs (neovim, zed)
- Work git identity and SSH configuration automatically - 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.cliTools.ansible.enable # Ansible (config rollout to servers)
base.shell.fish.enable # Fish shell
base.shell.nushell.enable # Nushell base.shell.nushell.enable # Nushell
base.shell.starship.enable # Starship prompt base.shell.starship.enable # Starship prompt
base.cliTools.fzf.enable # Fuzzy finder base.cliTools.fzf.enable # Fuzzy finder
+1 -2
View File
@@ -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, config,
lib, lib,
@@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.carapace = { programs.carapace = {
enable = true; enable = true;
enableFishIntegration = true;
enableNushellIntegration = true; enableNushellIntegration = true;
enableBashIntegration = true; enableBashIntegration = true;
}; };
-1
View File
@@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.eza = { programs.eza = {
enable = true; enable = true;
enableFishIntegration = true;
enableBashIntegration = true; enableBashIntegration = true;
extraOptions = ["-l" "--icons" "--git" "-a"]; extraOptions = ["-l" "--icons" "--git" "-a"];
}; };
-1
View File
@@ -16,7 +16,6 @@ in {
programs.fzf = programs.fzf =
{ {
enable = true; enable = true;
enableFishIntegration = true;
colors = { colors = {
"fg" = "#${config.colorScheme.palette.base05}"; "fg" = "#${config.colorScheme.palette.base05}";
"bg" = "#${config.colorScheme.palette.base00}"; "bg" = "#${config.colorScheme.palette.base00}";
-1
View File
@@ -17,7 +17,6 @@ in {
programs.nix-index = { programs.nix-index = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;
enableFishIntegration = true;
enableNushellIntegration = true; enableNushellIntegration = true;
}; };
}; };
+1 -2
View File
@@ -1,4 +1,4 @@
# Zoxide — smarter cd with Fish and Nushell integration. # Zoxide — smarter cd with Nushell integration.
{ {
config, config,
lib, lib,
@@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
enableFishIntegration = true;
enableNushellIntegration = true; enableNushellIntegration = true;
}; };
}; };
+1 -1
View File
@@ -1,7 +1,7 @@
# profiles/base/default.nix — Always loaded on every host. # profiles/base/default.nix — Always loaded on every host.
# #
# Provides: # 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) # - CLI tools (bat, carapace, direnv, eza, fzf, lf, nitch, television, zellij, zoxide)
# - Secrets management (pass-wayland) # - Secrets management (pass-wayland)
# - Color scheme (dracula) # - Color scheme (dracula)
+1 -1
View File
@@ -1,4 +1,4 @@
# Shell aggregator — imports Nushell (primary), Fish, and Starship prompt. # Shell aggregator — imports Nushell and Starship prompt.
{...}: { {...}: {
imports = [ imports = [
./nushell.nix ./nushell.nix
+10 -112
View File
@@ -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, config,
lib, lib,
... ...
}: }: {
with lib; let options.base.shell.fish.enable = lib.mkOption {
cfg = config.base.shell.fish; type = lib.types.bool;
in { default = false;
# Enabled by default — base modules are always-on. visible = false;
options.base.shell.fish.enable = (mkEnableOption "enable fish shell") // {default = true;}; description = "Deprecated no-op. Fish is no longer configured by m3ta-home.";
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";
};
};
}; };
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.";
} }
-1
View File
@@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.starship = { programs.starship = {
enable = true; enable = true;
enableFishIntegration = true;
enableNushellIntegration = true; enableNushellIntegration = true;
settings = { settings = {
format = "$all$character"; format = "$all$character";
-1
View File
@@ -94,7 +94,6 @@
programs.ghostty = { programs.ghostty = {
enable = true; enable = true;
enableFishIntegration = true;
enableBashIntegration = true; enableBashIntegration = true;
settings = { settings = {
font-family = "Fira Code"; font-family = "Fira Code";