diff --git a/modules/home-manager/programs/neovim/default.nix b/modules/home-manager/programs/neovim/default.nix
index 45132f7..fa5ed7d 100644
--- a/modules/home-manager/programs/neovim/default.nix
+++ b/modules/home-manager/programs/neovim/default.nix
@@ -130,11 +130,20 @@ in
       source = ./lua;
     };
 
-    xdg.configFile."nvim/lua/plugins/astrolsp.lua".text = import ./lsp.nix {
-      config = config;
-      pkgs = pkgs;
-    };
+    xdg.configFile."nvim/lua/plugins/astrolsp.lua".source = pkgs.runCommand "astrolsp.lua" { } ''
+      cp ${./lsp.lua} $out
 
-    xdg.configFile."nvim/lua/polish.lua".text = import ./polish.nix pkgs;
+      substituteInPlace $out \
+        --replace-fail "{hostname}" "${config.programs.neovim.nixd.hostname}" \
+        --replace-fail "{location}" "${config.programs.neovim.nixd.location}" \
+        --replace-fail "{pkgs.vue-language-server}" "${pkgs.vue-language-server}"
+    '';
+
+    xdg.configFile."nvim/lua/polish.lua".source = pkgs.runCommand "polish.lua" { } ''
+      cp ${./polish.lua} $out
+
+      substituteInPlace $out \
+        --replace-fail "{pkgs.vscode-extensions.ms-vscode.cpptools}" "${pkgs.vscode-extensions.ms-vscode.cpptools}" \
+    '';
   };
 }
diff --git a/modules/home-manager/programs/neovim/lsp.lua b/modules/home-manager/programs/neovim/lsp.lua
new file mode 100644
index 0000000..8760cea
--- /dev/null
+++ b/modules/home-manager/programs/neovim/lsp.lua
@@ -0,0 +1,192 @@
+-- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine
+-- Configuration documentation can be found with `:h astrolsp`
+-- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
+--       as this provides autocomplete and documentation while editing
+
+---@type LazySpec
+return {
+  "AstroNvim/astrolsp",
+  ---@type AstroLSPOpts
+  opts = {
+    -- Configuration table of features provided by AstroLSP
+    features = {
+      autoformat = true,      -- enable or disable auto formatting on start
+      codelens = true,        -- enable/disable codelens refresh on start
+      inlay_hints = false,    -- enable/disable inlay hints on start
+      semantic_tokens = true, -- enable/disable semantic token highlighting
+    },
+    -- customize lsp formatting options
+    formatting = {
+      -- control auto formatting on save
+      format_on_save = {
+        enabled = true,     -- enable or disable format on save globally
+        allow_filetypes = { -- enable format on save for specified filetypes only
+          -- "go",
+          "c",
+          "cpp",
+          "cs",
+          "h",
+          "javascript",
+          "jsx",
+          "lua",
+          "nix",
+          "rust",
+          "svelte",
+          "tsx",
+          "typescript",
+          "vue",
+        },
+        ignore_filetypes = { -- disable format on save for specified filetypes
+          -- "python",
+        },
+      },
+      disabled = { -- disable formatting capabilities for the listed language servers
+        -- disable lua_ls formatting capability if you want to use StyLua to format your lua code
+        -- "lua_ls",
+      },
+      timeout_ms = 1000, -- default format timeout
+      -- filter = function(client) -- fully override the default formatting function
+      --   return true
+      -- end
+    },
+    -- enable servers that you already have installed without mason
+    servers = {
+      "basedpyright",
+      "clangd",
+      "cmake",
+      "csharp_ls",
+      "cssls",
+      "denols",
+      "eslint",
+      "html",
+      "jsonls",
+      "lua_ls",
+      "marksman",
+      "nixd",
+      "rust_analyzer",
+      "svelte",
+      "taplo",
+      "volar",
+      "vtsls",
+      "yamlls",
+    },
+    -- customize language server configuration options passed to `lspconfig`
+    ---@diagnostic disable: missing-fields
+    config = {
+      -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
+      nixd = {
+        settings = {
+          nixd = {
+            nixpkgs = {
+              expr = "import (builtins.getFlake ({location})).inputs.nixpkgs { }",
+            },
+            options = {
+              nixos = {
+                expr = '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options',
+              },
+              home_manager = {
+                expr =
+                '(builtins.getFlake ("{location}")).nixosConfigurations.{hostname}.options.home-manager.users.type.getSubOptions []',
+              },
+            },
+          },
+        },
+      },
+      vtsls = {
+        filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
+        settings = {
+          vtsls = {
+            tsserver = {
+              globalPlugins = {
+                {
+                  name = "@vue/typescript-plugin",
+                  location = "{pkgs.vue-language-server}/lib/node_modules/@vue/language-server",
+                  languages = { "vue" },
+                  configNamespace = "typescript",
+                  enableForWorkspaceTypeScriptVersions = true,
+                },
+              },
+            },
+          },
+        },
+      },
+      rust_analyzer = {
+        settings = {
+          ["rust-analyzer"] = {
+            cargo = {
+              extraEnv = { CARGO_PROFILE_RUST_ANALYZER_INHERITS = "dev" },
+              extraArgs = { "--profile", "rust-analyzer" },
+            },
+            check = { command = "check", extraArgs = {} },
+          },
+        },
+      },
+    },
+    -- customize how language servers are attached
+    handlers = {
+      -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
+      -- function(server, opts) require("lspconfig")[server].setup(opts) end
+
+      -- the key is the server that is being setup with `lspconfig`
+      -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
+      -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
+    },
+    -- Configure buffer local auto commands to add when attaching a language server
+    autocmds = {
+      -- first key is the `augroup` to add the auto commands to (:h augroup)
+      lsp_document_highlight = {
+        -- Optional condition to create/delete auto command group
+        -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
+        -- condition will be resolved for each client on each execution and if it ever fails for all clients,
+        -- the auto commands will be deleted for that buffer
+        cond = "textDocument/documentHighlight",
+        -- cond = function(client, bufnr) return client.name == "lua_ls" end,
+        -- list of auto commands to set
+        {
+          -- events to trigger
+          event = { "CursorHold", "CursorHoldI" },
+          -- the rest of the autocmd options (:h nvim_create_autocmd)
+          desc = "Document Highlighting",
+          callback = function()
+            vim.lsp.buf.document_highlight()
+          end,
+        },
+        {
+          event = { "CursorMoved", "CursorMovedI", "BufLeave" },
+          desc = "Document Highlighting Clear",
+          callback = function()
+            vim.lsp.buf.clear_references()
+          end,
+        },
+      },
+    },
+    -- mappings to be set up on attaching of a language server
+    mappings = {
+      n = {
+        gl = {
+          function()
+            vim.diagnostic.open_float()
+          end,
+          desc = "Hover diagnostics",
+        },
+        -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
+        -- gD = {
+        --   function() vim.lsp.buf.declaration() end,
+        --   desc = "Declaration of current symbol",
+        --   cond = "textDocument/declaration",
+        -- },
+        -- ["<Leader>uY"] = {
+        --   function() require("astrolsp.toggles").buffer_semantic_tokens() end,
+        --   desc = "Toggle LSP semantic highlight (buffer)",
+        --   cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end,
+        -- },
+      },
+    },
+    -- A custom `on_attach` function to be run after the default `on_attach` function
+    -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
+    on_attach = function(client, bufnr)
+      -- this would disable semanticTokensProvider for all clients
+      -- client.server_capabilities.semanticTokensProvider = nil
+    end,
+  },
+}
diff --git a/modules/home-manager/programs/neovim/lsp.nix b/modules/home-manager/programs/neovim/lsp.nix
deleted file mode 100644
index f65c8f5..0000000
--- a/modules/home-manager/programs/neovim/lsp.nix
+++ /dev/null
@@ -1,200 +0,0 @@
-{ config, pkgs }:
-let
-  hostname = config.programs.neovim.nixd.hostname;
-  location = config.programs.neovim.nixd.location;
-in
-#lua
-''
-  -- AstroLSP allows you to customize the features in AstroNvim's LSP configuration engine
-  -- Configuration documentation can be found with `:h astrolsp`
-  -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`)
-  --       as this provides autocomplete and documentation while editing
-
-  ---@type LazySpec
-  return {
-    "AstroNvim/astrolsp",
-    ---@type AstroLSPOpts
-    opts = {
-      -- Configuration table of features provided by AstroLSP
-      features = {
-        autoformat = true,      -- enable or disable auto formatting on start
-        codelens = true,        -- enable/disable codelens refresh on start
-        inlay_hints = false,    -- enable/disable inlay hints on start
-        semantic_tokens = true, -- enable/disable semantic token highlighting
-      },
-      -- customize lsp formatting options
-      formatting = {
-        -- control auto formatting on save
-        format_on_save = {
-          enabled = true,     -- enable or disable format on save globally
-          allow_filetypes = { -- enable format on save for specified filetypes only
-            -- "go",
-            "c",
-            "cpp",
-            "cs",
-            "h",
-            "javascript",
-            "jsx",
-            "lua",
-            "nix",
-            "rust",
-            "svelte",
-            "tsx",
-            "typescript",
-            "vue",
-          },
-          ignore_filetypes = { -- disable format on save for specified filetypes
-            -- "python",
-          },
-        },
-        disabled = { -- disable formatting capabilities for the listed language servers
-          -- disable lua_ls formatting capability if you want to use StyLua to format your lua code
-          -- "lua_ls",
-        },
-        timeout_ms = 1000, -- default format timeout
-        -- filter = function(client) -- fully override the default formatting function
-        --   return true
-        -- end
-      },
-      -- enable servers that you already have installed without mason
-      servers = {
-        "basedpyright",
-        "clangd",
-        "cmake",
-        "csharp_ls",
-        "cssls",
-        "denols",
-        "eslint",
-        "html",
-        "jsonls",
-        "lua_ls",
-        "marksman",
-        "nixd",
-        "rust_analyzer",
-        "svelte",
-        "taplo",
-        "volar",
-        "vtsls",
-        "yamlls",
-      },
-      -- customize language server configuration options passed to `lspconfig`
-      ---@diagnostic disable: missing-fields
-      config = {
-        -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
-        nixd = {
-          settings = {
-            nixd = {
-              nixpkgs = {
-                expr = 'import (builtins.getFlake (${location})).inputs.nixpkgs { }',
-              },
-              options = {
-                nixos = {
-                  expr = '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options',
-                },
-                home_manager = {
-                  expr =
-                    '(builtins.getFlake ("${location}")).nixosConfigurations.${hostname}.options.home-manager.users.type.getSubOptions []',
-                },
-              },
-            },
-          },
-        },
-        vtsls = {
-          filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" },
-          settings = {
-            vtsls = {
-              tsserver = {
-                globalPlugins = {
-                  {
-                    name = "@vue/typescript-plugin",
-                    location = "${pkgs.vue-language-server}/lib/node_modules/@vue/language-server",
-                    languages = { "vue" },
-                    configNamespace = "typescript",
-                    enableForWorkspaceTypeScriptVersions = true,
-                  }
-                },
-              },
-            },
-          },
-        },
-        rust_analyzer = {
-          settings = {
-            ["rust-analyzer"] = {
-              cargo = {
-                extraEnv = { CARGO_PROFILE_RUST_ANALYZER_INHERITS = "dev" },
-                extraArgs = { "--profile", "rust-analyzer" },
-              },
-              check = { command = "check", extraArgs = {} },
-            },
-          }
-        }
-      },
-      -- customize how language servers are attached
-      handlers = {
-        -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
-        -- function(server, opts) require("lspconfig")[server].setup(opts) end
-
-        -- the key is the server that is being setup with `lspconfig`
-        -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
-        -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
-      },
-      -- Configure buffer local auto commands to add when attaching a language server
-      autocmds = {
-        -- first key is the `augroup` to add the auto commands to (:h augroup)
-        lsp_document_highlight = {
-          -- Optional condition to create/delete auto command group
-          -- can either be a string of a client capability or a function of `fun(client, bufnr): boolean`
-          -- condition will be resolved for each client on each execution and if it ever fails for all clients,
-          -- the auto commands will be deleted for that buffer
-          cond = "textDocument/documentHighlight",
-          -- cond = function(client, bufnr) return client.name == "lua_ls" end,
-          -- list of auto commands to set
-          {
-            -- events to trigger
-            event = { "CursorHold", "CursorHoldI" },
-            -- the rest of the autocmd options (:h nvim_create_autocmd)
-            desc = "Document Highlighting",
-            callback = function()
-              vim.lsp.buf.document_highlight()
-            end,
-          },
-          {
-            event = { "CursorMoved", "CursorMovedI", "BufLeave" },
-            desc = "Document Highlighting Clear",
-            callback = function()
-              vim.lsp.buf.clear_references()
-            end,
-          },
-        },
-      },
-      -- mappings to be set up on attaching of a language server
-      mappings = {
-        n = {
-          gl = {
-            function()
-              vim.diagnostic.open_float()
-            end,
-            desc = "Hover diagnostics",
-          },
-          -- a `cond` key can provided as the string of a server capability to be required to attach, or a function with `client` and `bufnr` parameters from the `on_attach` that returns a boolean
-          -- gD = {
-          --   function() vim.lsp.buf.declaration() end,
-          --   desc = "Declaration of current symbol",
-          --   cond = "textDocument/declaration",
-          -- },
-          -- ["<Leader>uY"] = {
-          --   function() require("astrolsp.toggles").buffer_semantic_tokens() end,
-          --   desc = "Toggle LSP semantic highlight (buffer)",
-          --   cond = function(client) return client.server_capabilities.semanticTokensProvider and vim.lsp.semantic_tokens end,
-          -- },
-        },
-      },
-      -- A custom `on_attach` function to be run after the default `on_attach` function
-      -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
-      on_attach = function(client, bufnr)
-        -- this would disable semanticTokensProvider for all clients
-        -- client.server_capabilities.semanticTokensProvider = nil
-      end,
-    },
-  }
-''
diff --git a/modules/home-manager/programs/neovim/polish.lua b/modules/home-manager/programs/neovim/polish.lua
new file mode 100644
index 0000000..ba33487
--- /dev/null
+++ b/modules/home-manager/programs/neovim/polish.lua
@@ -0,0 +1,96 @@
+-- This will run last in the setup process and is a good place to configure
+-- things like custom filetypes. This just pure lua so anything that doesn't
+-- fit in the normal config locations above can go here
+
+-- Set up custom filetypes
+vim.filetype.add({
+  extension = {
+    foo = "fooscript",
+  },
+  filename = {
+    ["Foofile"] = "fooscript",
+  },
+  pattern = {
+    ["~/%.config/foo/.*"] = "fooscript",
+  },
+})
+
+local dap = require("dap")
+
+-- @type DapAdapter
+dap.adapters.codelldb = {
+  port = "${port}",
+  type = "server",
+  executable = {
+    command = "codelldb",
+    args = { "--port", "${port}" },
+  },
+}
+
+-- @type DapAdapter
+dap.adapters.cppdbg = {
+  id = "cppdbg",
+  type = "executable",
+  command = "{pkgs.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7",
+}
+
+-- @type DapAdapter
+dap.adapters.coreclr = {
+  type = "executable",
+  command = "netcoredbg",
+  args = { "--interpreter=vscode" },
+}
+
+-- @type DapConfiguration
+dap.configurations.rust = {
+  {
+    name = "Launch file",
+    type = "codelldb",
+    request = "launch",
+    program = function()
+      return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+    end,
+    cwd = "${workspaceFolder}",
+    stopOnEntry = false,
+  },
+}
+
+-- @type DapConfiguration
+dap.configurations.cpp = {
+  {
+    name = "Launch file",
+    type = "cppdbg",
+    request = "launch",
+    program = function()
+      return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+    end,
+    cwd = "${workspaceFolder}",
+    stopAtEntry = true,
+  },
+  {
+    name = "Attach to gdbserver :1234",
+    type = "cppdbg",
+    request = "launch",
+    MIMode = "gdb",
+    miDebuggerServerAddress = "localhost:1234",
+    miDebuggerPath = "/usr/bin/gdb",
+    cwd = "${workspaceFolder}",
+    program = function()
+      return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+    end,
+  },
+}
+
+dap.configurations.c = dap.configurations.cpp
+
+-- @type DapConfiguration
+dap.configurations.cs = {
+  {
+    type = "coreclr",
+    name = "launch - netcoredbg",
+    request = "launch",
+    program = function()
+      return vim.fn.input("Path to dll", vim.fn.getcwd() .. "/bin/Debug/", "file")
+    end,
+  },
+}
diff --git a/modules/home-manager/programs/neovim/polish.nix b/modules/home-manager/programs/neovim/polish.nix
deleted file mode 100644
index 271e7ae..0000000
--- a/modules/home-manager/programs/neovim/polish.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-pkgs:
-#lua
-''
-  -- This will run last in the setup process and is a good place to configure
-  -- things like custom filetypes. This just pure lua so anything that doesn't
-  -- fit in the normal config locations above can go here
-
-  -- Set up custom filetypes
-  vim.filetype.add({
-    extension = {
-      foo = "fooscript",
-    },
-    filename = {
-      ["Foofile"] = "fooscript",
-    },
-    pattern = {
-      ["~/%.config/foo/.*"] = "fooscript",
-    },
-  })
-
-  local dap = require("dap")
-
-  -- @type DapAdapter
-  dap.adapters.codelldb = {
-    port = "''${port}",
-    type = "server",
-    executable = {
-      command = "codelldb",
-      args = { "--port", "''${port}" },
-    },
-  }
-
-  -- @type DapAdapter
-  dap.adapters.cppdbg = {
-    id = "cppdbg",
-    type = "executable",
-    command =
-    "${pkgs.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7",
-  }
-
-  -- @type DapAdapter
-  dap.adapters.coreclr = {
-    type = "executable",
-    command = "netcoredbg",
-    args = {"--interpreter=vscode"}
-  }
-
-  -- @type DapConfiguration
-  dap.configurations.rust = {
-    {
-      name = "Launch file",
-      type = "codelldb",
-      request = "launch",
-      program = function()
-        return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-      end,
-      cwd = "''${workspaceFolder}",
-      stopOnEntry = false,
-    },
-  }
-
-  -- @type DapConfiguration
-  dap.configurations.cpp = {
-    {
-      name = "Launch file",
-      type = "cppdbg",
-      request = "launch",
-      program = function()
-        return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-      end,
-      cwd = "''${workspaceFolder}",
-      stopAtEntry = true,
-    },
-    {
-      name = "Attach to gdbserver :1234",
-      type = "cppdbg",
-      request = "launch",
-      MIMode = "gdb",
-      miDebuggerServerAddress = "localhost:1234",
-      miDebuggerPath = "/usr/bin/gdb",
-      cwd = "''${workspaceFolder}",
-      program = function()
-        return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-      end,
-    },
-  }
-
-  dap.configurations.c = dap.configurations.cpp
-
-  -- @type DapConfiguration
-  dap.configurations.cs = {
-    {
-      type = "coreclr",
-      name = "launch - netcoredbg",
-      request = "launch",
-      program = function()
-          return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file')
-      end,
-    },
-  }
-''