diff --git a/computers/shared/default.nix b/computers/shared/default.nix
new file mode 100644
index 0000000..3dd1a50
--- /dev/null
+++ b/computers/shared/default.nix
@@ -0,0 +1,5 @@
+{...}: {
+  imports = [
+    ./fish.nix
+  ];
+}
diff --git a/computers/shared/fish.nix b/computers/shared/fish.nix
new file mode 100644
index 0000000..f7e921d
--- /dev/null
+++ b/computers/shared/fish.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.alqueva.fish;
+in {
+  options.alqueva.fish = {
+    enable = lib.mkEnableOption "fish";
+  };
+  config = lib.mkIf cfg.enable {
+    programs.fish = {
+      vendor = {
+        functions.enable = true;
+        config.enable = true;
+        completions.enable = true;
+      };
+      enable = true;
+    };
+  };
+}
diff --git a/lib/default.nix b/lib/default.nix
index f667258..3bfbebb 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,8 +11,10 @@
         extraModules
         ++ [
           ../computers/${host}
+          inputs.self.nixosModules.default
           ({config, ...}: {
             config = {
+              alqueva.fish.enable = true;
               nix = {
                 settings.extra-experimental-features = [
                   "nix-command"
@@ -23,14 +25,6 @@
                   dates = "weekly";
                 };
               };
-              programs.fish = {
-                vendor = {
-                  functions.enable = true;
-                  config.enable = true;
-                  completions.enable = true;
-                };
-                enable = true;
-              };
               users = {
                 users.${user} = {
                   isNormalUser = true;