diff --git a/lib/languages.nix b/lib/languages.nix index 899d9ea8..423c4f8a 100644 --- a/lib/languages.nix +++ b/lib/languages.nix @@ -77,4 +77,7 @@ in { }; }; }; + + # maybe put generic function to set indent for provided langs + # Then we can just call it with the lib arg } diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index b1f7efba..16b27f19 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -4,12 +4,13 @@ lib, ... }: let - inherit (builtins) attrNames; + inherit (builtins) attrNames toString; inherit (lib) concatStringsSep; inherit (lib.meta) getExe; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; + inherit (lib.types) int; inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf; inherit (lib.nvim.attrsets) mapListToAttrs; @@ -167,8 +168,8 @@ in { }; }) - vim = { - autocmds = [ + { + vim.autocmds = [ { desc = "Sets indent for nix files"; event = ["BufEnter"]; @@ -178,14 +179,15 @@ in { ]; callback = lib.generators.mkLuaInline '' function() - vim.opt.tabstop = ${cfg.indentSize} - vim.opt.softtabstop = ${cfg.indentSize} - vim.opt.shiftwidth = ${cfg.indentSize} + vim.opt.tabstop = ${toString cfg.indentSize} + vim.opt.softtabstop = ${toString cfg.indentSize} + vim.opt.shiftwidth = ${toString cfg.indentSize} end ''; once = true; } ]; } - ]) + + ]); }