vim: use lua generator for variables and LSP config

1 files changed, 8 insertions, 10 deletions

diff --git a/common/vim.nix b/common/vim.nix
index 850eaf3..83ac31b 100644
--- a/common/vim.nix
+++ b/common/vim.nix
@@ -5,6 +5,8 @@ inputs:
 let
   inherit (pkgs.unstable) vimPlugins wrapNeovim;
 
+  luaFormat = inputs.self.lib.generators.lua { };
+
   neovim-unwrapped = inputs.neovim-master.defaultPackage.${config.nixpkgs.system};
 
   cfg = config.vim;
@@ -18,7 +20,7 @@ let
         ${(concatStringsSep
           "\n"
           (mapAttrsToList
-            (variable: value: "vim.g.${variable} = ${value}")
+            (variable: value: "vim.g.${variable} = ${luaFormat.generate value}")
             cfg.variables))}
 
         -- vim.lua from the NixOS configuration
@@ -104,13 +106,9 @@ in
   options.vim = with lib; {
 
     variables = mkOption {
-      type = types.attrsOf types.str;
+      type = types.attrsOf luaFormat.type;
       default = {};
-      description = ''
-        Extra global variables to add at the beginning of the vim configuration.
-
-        Remember to escape strings with single-quotes.
-      '';
+      description = "Extra global variables to add at the beginning of the vim configuration.";
     };
 
     extraPlugins = mkOption {
@@ -148,9 +146,9 @@ in
     vim = {
       wrappedPackage = myNeovim;
       variables = {
-        dominant_color = "'${config.theme.colors.dominant}'";
-        ripgrep_path = "'${pkgs.ripgrep}/bin/rg'";
-        fd_path = "'${pkgs.fd}/bin/fd'";
+        dominant_color = "${config.theme.colors.dominant}";
+        ripgrep_path = "${pkgs.ripgrep}/bin/rg";
+        fd_path = "${pkgs.fd}/bin/fd";
       };
     };