diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 36209ff7..03d4d010 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -13,4 +13,8 @@
 
 [haskell-tools.nvim]: https://github.com/MrcJkb/haskell-tools.nvim
 
-- Add Haskell support under `vim.languages.haskell` using [haskell-tools.nvim]
+- Add Haskell support under `vim.languages.haskell` using [haskell-tools.nvim].
+
+[diniamo](https://github.com/diniamo):
+
+- Add Odin support under `vim.languages.odin`.
diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix
index 48945b38..ee9f55e1 100644
--- a/modules/plugins/languages/default.nix
+++ b/modules/plugins/languages/default.nix
@@ -37,6 +37,7 @@ in {
     ./csharp.nix
     ./julia.nix
     ./nu.nix
+    ./odin.nix
   ];
 
   options.vim.languages = {
diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix
index f8e17b75..62f4cd41 100644
--- a/modules/plugins/languages/haskell.nix
+++ b/modules/plugins/languages/haskell.nix
@@ -92,7 +92,7 @@ in {
                 cmd = ${
                 if isList cfg.dap.package
                 then expToLua cfg.dap.package
-                else ''${cfg.dap.package}/bin/haskell-debug-adapter''
+                else ''{"${cfg.dap.package}/bin/haskell-debug-adapter"}''
               },
               },
             ''}
diff --git a/modules/plugins/languages/odin.nix b/modules/plugins/languages/odin.nix
new file mode 100644
index 00000000..7a32db93
--- /dev/null
+++ b/modules/plugins/languages/odin.nix
@@ -0,0 +1,71 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (builtins) attrNames;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.lists) isList;
+  inherit (lib.types) either listOf package str enum;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
+
+  defaultServer = "ols";
+  servers = {
+    ols = {
+      package = pkgs.ols;
+      lspConfig = ''
+        lspconfig.ols.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else "{'${cfg.lsp.package}/bin/ols'}"
+        }
+        }
+      '';
+    };
+  };
+
+  cfg = config.vim.languages.odin;
+in {
+  options.vim.languages.odin = {
+    enable = mkEnableOption "Odin language support";
+
+    treesitter = {
+      enable = mkEnableOption "Odin treesitter" // {default = config.vim.languages.enableTreesitter;};
+      package = mkGrammarOption pkgs "odin";
+    };
+
+    lsp = {
+      enable = mkEnableOption "Odin LSP support" // {default = config.vim.languages.enableLSP;};
+
+      server = mkOption {
+        type = enum (attrNames servers);
+        default = defaultServer;
+        description = "Odin LSP server to use";
+      };
+
+      package = mkOption {
+        description = "Ols package, or the command to run as a list of strings";
+        type = either package (listOf str);
+        default = pkgs.ols;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+      vim.lsp.lspconfig.sources.odin-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+  ]);
+}
diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix
index 7ae8a5c2..3618d6d8 100644
--- a/modules/plugins/languages/zig.nix
+++ b/modules/plugins/languages/zig.nix
@@ -57,6 +57,7 @@ in {
       };
     };
   };
+
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
diff --git a/modules/plugins/utility/surround/config.nix b/modules/plugins/utility/surround/config.nix
index 7161cf6b..31b4033d 100644
--- a/modules/plugins/utility/surround/config.nix
+++ b/modules/plugins/utility/surround/config.nix
@@ -4,51 +4,33 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.utility.surround;
   mkLznKey = mode: key: {
-    inherit key mode;
+    inherit mode key;
   };
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["nvim-surround"];
-      pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})";
-
       lazy.plugins.nvim-surround = {
         package = "nvim-surround";
+
         setupModule = "nvim-surround";
         inherit (cfg) setupOpts;
 
-        keys =
-          [
-            (mkLznKey ["i"] cfg.setupOpts.keymaps.insert)
-            (mkLznKey ["i"] cfg.setupOpts.keymaps.insert_line)
-            (mkLznKey ["x"] cfg.setupOpts.keymaps.visual)
-            (mkLznKey ["x"] cfg.setupOpts.keymaps.visual_line)
-            (mkLznKey ["n"] cfg.setupOpts.keymaps.normal)
-            (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur)
-            (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_line)
-            (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur_line)
-            (mkLznKey ["n"] cfg.setupOpts.keymaps.delete)
-            (mkLznKey ["n"] cfg.setupOpts.keymaps.change)
-            (mkLznKey ["n"] cfg.setupOpts.keymaps.change_line)
-          ]
-          ++ map (mkLznKey ["n" "i" "v"]) [
-            "<Plug>(nvim-surround-insert)"
-            "<Plug>(nvim-surround-insert-line)"
-            "<Plug>(nvim-surround-normal)"
-            "<Plug>(nvim-surround-normal-cur)"
-            "<Plug>(nvim-surround-normal-line)"
-            "<Plug>(nvim-surround-normal-cur-line)"
-            "<Plug>(nvim-surround-visual)"
-            "<Plug>(nvim-surround-visual-line)"
-            "<Plug>(nvim-surround-delete)"
-            "<Plug>(nvim-surround-change)"
-            "<Plug>(nvim-surround-change-line)"
-          ];
+        keys = [
+          (mkLznKey "i" cfg.setupOpts.keymaps.insert)
+          (mkLznKey "i" cfg.setupOpts.keymaps.insert_line)
+          (mkLznKey "x" cfg.setupOpts.keymaps.visual)
+          (mkLznKey "x" cfg.setupOpts.keymaps.visual_line)
+          (mkLznKey "n" cfg.setupOpts.keymaps.normal)
+          (mkLznKey "n" cfg.setupOpts.keymaps.normal_cur)
+          (mkLznKey "n" cfg.setupOpts.keymaps.normal_line)
+          (mkLznKey "n" cfg.setupOpts.keymaps.normal_cur_line)
+          (mkLznKey "n" cfg.setupOpts.keymaps.delete)
+          (mkLznKey "n" cfg.setupOpts.keymaps.change)
+          (mkLznKey "n" cfg.setupOpts.keymaps.change_line)
+        ];
       };
     };
   };
diff --git a/modules/wrapper/lazy/config.nix b/modules/wrapper/lazy/config.nix
index 6a9a6ea2..3468d5ec 100644
--- a/modules/wrapper/lazy/config.nix
+++ b/modules/wrapper/lazy/config.nix
@@ -76,6 +76,7 @@
         else
           mkLuaInline ''
             function()
+              ${optionalString (spec.beforeSetup != null) spec.beforeSetup}
               ${
               optionalString (spec.setupModule != null)
               "require(${toJSON spec.setupModule}).setup(${toLuaObject spec.setupOpts})"
diff --git a/modules/wrapper/lazy/lazy.nix b/modules/wrapper/lazy/lazy.nix
index e0dbea85..730bf267 100644
--- a/modules/wrapper/lazy/lazy.nix
+++ b/modules/wrapper/lazy/lazy.nix
@@ -74,6 +74,15 @@
         '';
       };
 
+      beforeSetup = mkOption {
+        type = nullOr lines;
+        default = null;
+        description = ''
+          Lua code to run after the plugin is loaded, but before the setup
+          function is called.
+        '';
+      };
+
       setupModule = mkOption {
         type = nullOr str;
         default = null;