diff --git a/nix/modules/fish/default.nix b/nix/modules/fish/default.nix
index fb4af30..6c712f7 100644
--- a/nix/modules/fish/default.nix
+++ b/nix/modules/fish/default.nix
@@ -1,4 +1,4 @@
 _: {
   home = ./home.nix;
-  # nixos: ./nixos.nix;
+  nixos = ./nixos.nix;
 }
diff --git a/nix/modules/fish/nixos.nix b/nix/modules/fish/nixos.nix
new file mode 100644
index 0000000..03b1eb5
--- /dev/null
+++ b/nix/modules/fish/nixos.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.modules.fish;
+in
+{
+  options.modules.fish = {
+    enable = lib.mkEnableOption "Fish";
+  };
+  config = lib.mkIf cfg.enable {
+    users.defaultUserShell = pkgs.fish;
+    programs.fish = {
+      enable = true;
+    };
+  };
+}