diff --git a/home/lilith/default.nix b/home/lilith/default.nix
index 0d807614..9ea9c764 100644
--- a/home/lilith/default.nix
+++ b/home/lilith/default.nix
@@ -18,6 +18,8 @@
     ./input.nix
     ./starship.nix
 
+    ./fish.nix
+
     ./common.nix
     ./direnv.nix
     # ./firefox.nix
diff --git a/home/lilith/fish.nix b/home/lilith/fish.nix
new file mode 100644
index 00000000..4b5ba3e2
--- /dev/null
+++ b/home/lilith/fish.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ grc ];
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set fish_greeting # Disable greeting
+    '';
+    plugins =
+      let
+        mkPlugin = plugin: {
+          name = plugin;
+          src = pkgs.fishPlugins."${plugin}".src;
+        };
+      in
+      map mkPlugin [
+        "puffer"
+        "grc"
+        "fzf-fish"
+      ];
+  };
+}
diff --git a/system/core/default.nix b/system/core/default.nix
index 14c2202c..67756c19 100644
--- a/system/core/default.nix
+++ b/system/core/default.nix
@@ -15,7 +15,7 @@
     ./syncthing.nix
     ./power.nix
     ./users.nix
-    ./zsh.nix
+    ./fish.nix
 
     ./virtualization.nix
   ];
diff --git a/system/core/fish.nix b/system/core/fish.nix
new file mode 100644
index 00000000..dcaa9a12
--- /dev/null
+++ b/system/core/fish.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  programs.fish = {
+    enable = true;
+    generateCompletions = true;
+  };
+  users.defaultUserShell = pkgs.fish;
+}
diff --git a/system/core/zsh.nix b/system/core/zsh.nix
deleted file mode 100644
index ad14ac47..00000000
--- a/system/core/zsh.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  programs.zsh.enable = true;
-  users.defaultUserShell = pkgs.zsh;
-}