diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/filetrees/nvim-tree.nix
index 30ea8fd8..d1962647 100644
--- a/plugins/filetrees/nvim-tree.nix
+++ b/plugins/filetrees/nvim-tree.nix
@@ -1136,8 +1136,7 @@ in {
       ];
 
       autoCmd =
-        []
-        ++ (optional autoOpenEnabled {
+        (optional autoOpenEnabled {
           event = "VimEnter";
           callback = helpers.mkRaw "open_nvim_tree";
         })
diff --git a/plugins/languages/clangd-extensions.nix b/plugins/languages/clangd-extensions.nix
index e4df2be9..fd7d0f8a 100644
--- a/plugins/languages/clangd-extensions.nix
+++ b/plugins/languages/clangd-extensions.nix
@@ -213,23 +213,27 @@ in {
         You should set `plugins.lsp.enable = true` to make use of the clangd-extensions' features.
       '';
 
-      plugins.lsp.servers.clangd.extraOptions = mkIf cfg.enableOffsetEncodingWorkaround {
-        capabilities = {__raw = "__clangdCaps";};
+      plugins.lsp = {
+        servers.clangd = {
+          # Enable the clangd language server
+          enable = true;
+
+          extraOptions = mkIf cfg.enableOffsetEncodingWorkaround {
+            capabilities = {__raw = "__clangdCaps";};
+          };
+        };
+
+        preConfig =
+          optionalString
+          cfg.enableOffsetEncodingWorkaround
+          ''
+            local __clangdCaps = vim.lsp.protocol.make_client_capabilities()
+            __clangdCaps.offsetEncoding = { "utf-16" }
+          '';
       };
 
       extraPlugins = [cfg.package];
 
-      # Enable the clangd language server
-      plugins.lsp.servers.clangd.enable = true;
-
-      plugins.lsp.preConfig =
-        optionalString
-        cfg.enableOffsetEncodingWorkaround
-        ''
-          local __clangdCaps = vim.lsp.protocol.make_client_capabilities()
-          __clangdCaps.offsetEncoding = { "utf-16" }
-        '';
-
       plugins.lsp.postConfig = ''
         require("clangd_extensions").setup(${helpers.toLuaObject setupOptions})
       '';
diff --git a/tests/test-sources/example-configurations/issues.nix b/tests/test-sources/example-configurations/issues.nix
index 86327875..0edbef66 100644
--- a/tests/test-sources/example-configurations/issues.nix
+++ b/tests/test-sources/example-configurations/issues.nix
@@ -73,9 +73,11 @@
     plugins = {
       lsp = {
         enable = true;
-        servers.rnix-lsp.enable = true;
-        servers.rust-analyzer.enable = true;
-        servers.jsonls.enable = true;
+        servers = {
+          rnix-lsp.enable = true;
+          rust-analyzer.enable = true;
+          jsonls.enable = true;
+        };
       };
 
       nvim-tree = {
diff --git a/tests/test-sources/plugins/statuslines/lualine.nix b/tests/test-sources/plugins/statuslines/lualine.nix
index 58fe349f..6dca04d9 100644
--- a/tests/test-sources/plugins/statuslines/lualine.nix
+++ b/tests/test-sources/plugins/statuslines/lualine.nix
@@ -59,9 +59,11 @@
           # you can specify only the sections you want to change
           {
             name = "filename";
-            extraConfig.newfile_status = true;
-            extraConfig.path = 1;
-            extraConfig.shorting_target = 60;
+            extraConfig = {
+              newfile_status = true;
+              path = 1;
+              shorting_target = 60;
+            };
           }
         ];
         lualine_z = [