diff --git a/modules/nixos/programs/fish/default.nix b/modules/nixos/programs/fish/default.nix
new file mode 100644
index 0000000..c68ce89
--- /dev/null
+++ b/modules/nixos/programs/fish/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+
+  cfg = config.marleyos.programs.fish;
+in {
+  options.marleyos.programs.fish.enable = mkEnableOption "fish";
+
+  config = mkIf cfg.enable {
+    programs.fish = {
+      enable = true;
+      useBabelfish = true;
+    };
+
+    users.defaultUserShell = pkgs.fish;
+  };
+}
diff --git a/systems/x86_64-linux/nyx/default.nix b/systems/x86_64-linux/nyx/default.nix
index e0aabf2..dff07b2 100644
--- a/systems/x86_64-linux/nyx/default.nix
+++ b/systems/x86_64-linux/nyx/default.nix
@@ -36,6 +36,10 @@ in {
 
     wayland.hyprland = enabled;
 
+    programs = {
+      fish = enabled;
+    };
+
     services = {
       ly = enabled;
     };