From 8e0f7b4c6f69b10cb407ae18eb2a5058e5ea2d6c Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Sun, 26 Jan 2025 14:38:45 +0100
Subject: [PATCH] enable fish shell explicilty for 0xa

---
 hosts/toaster/default.nix       | 3 ++-
 modules/basic-tools/default.nix | 3 +--
 modules/basic-tools/fish.nix    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hosts/toaster/default.nix b/hosts/toaster/default.nix
index b3e0d38..8003440 100644
--- a/hosts/toaster/default.nix
+++ b/hosts/toaster/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ pkgs, config, ... }:
 {
   imports = [
     ./amd.nix
@@ -60,6 +60,7 @@
     home = "/home/0xa";
     isNormalUser = true;
     uid = 1000;
+    shell = pkgs.fish;
   };
 
   services.emacs.defaultEditor = false;
diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 9408778..699de18 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -73,8 +73,7 @@
     vim = "nvim";
     grep = "grep --color=auto";
   };
-  users.defaultUserShell = (if config.networking.hostName == "toaster" then pkgs.fish else pkgs.zsh);
-  users.users.root.shell = pkgs.zsh; # keep root shell posix compatible
+  users.defaultUserShell = pkgs.zsh; # keep root shell posix compatible
 
   programs.iftop.enable = true;
   programs.mosh.enable = true;
diff --git a/modules/basic-tools/fish.nix b/modules/basic-tools/fish.nix
index b948149..d958060 100644
--- a/modules/basic-tools/fish.nix
+++ b/modules/basic-tools/fish.nix
@@ -14,6 +14,7 @@
     enable = true;
     interactiveShellInit = ''
       set fish_greeting
+      set fish_command_not_found
     '';
     shellAliases = {
       ls = "lsd --icon=never";