diff --git a/pkgs/default.nix b/pkgs/default.nix
index 35c5b95..f25637b 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -29,4 +29,7 @@ in
     circadian_lighting = callPackage ./home-assistant-custom-components/circadian_lighting.nix { };
     guntamatic = callPackage ./home-assistant-custom-components/guntamatic.nix { };
   };
+  vimPlugins = prev.vimPlugins // {
+    vim-fluid = callPackage ./vim-fluid { inherit (prev.vimUtils) buildVimPlugin; };
+  };
 }
diff --git a/pkgs/vim-fluid/default.nix b/pkgs/vim-fluid/default.nix
new file mode 100644
index 0000000..35f232f
--- /dev/null
+++ b/pkgs/vim-fluid/default.nix
@@ -0,0 +1,12 @@
+{ buildVimPlugin, fetchFromGitHub }:
+buildVimPlugin {
+  pname = "vim-fluid";
+  version = "0.0.1";
+  src = fetchFromGitHub {
+    owner = "mipmip";
+    repo = "vim-fluid";
+    rev = "cedc4ad871941e8f7134d1d71f9434f1bc3d93d5";
+    sha256 = "sha256-LiS2Dqw1K1Fu5VfHQnxIBDxDzEarmSAUUavQcwHRDsQ=";
+  };
+  meta.homepage = "https://github.com/mipmip/vim-fluid";
+}
diff --git a/users/jalr/modules/neovim.nix b/users/jalr/modules/neovim.nix
index 4654577..ddda151 100644
--- a/users/jalr/modules/neovim.nix
+++ b/users/jalr/modules/neovim.nix
@@ -101,6 +101,12 @@ in
           lua require'nvim-treesitter.configs'.setup { highlight = { enable = true, }, }
         '';
       }
+      {
+        plugin = vim-fluid;
+        config = ''
+          au BufRead *.html if join(getline(1,3), "\n") =~ 'data-namespace-typo3-fluid="true"' | setlocal filetype=fluid | endif
+        '';
+      }
       vim-gitgutter
       vim-indent-guides
       vim-nix