NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 18:31:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

More mkLuaInline

Browse source
This commit is contained in:
Liyua 2025-07-01 20:39:16 +02:00
commit 592de7979a
No known key found for this signature in database
GPG key ID: AFF37010586DE14D
1 changed files with 42 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

69
modules/plugins/languages/nix.nix
View file

@ -4,7 +4,8 @@
lib, lib,
inputs, inputs,
... ...
}: let }:
let
inherit (builtins) attrNames; inherit (builtins) attrNames;
inherit (lib) concatStringsSep mkLuaInline; inherit (lib) concatStringsSep mkLuaInline;
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
@ -12,8 +13,7 @@
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList; inherit (lib.lists) isList;
inherit (lib.strings) optionalString; inherit (lib.strings) optionalString;
inherit inherit (lib.types)
(lib.types)
anything anything
attrsOf attrsOf
enum enum
@ -32,10 +32,9 @@
noFormat = "on_attach = attach_keymaps"; noFormat = "on_attach = attach_keymaps";
defaultServer = "nil"; defaultServer = "nil";
packageToCmd = package: defaultCmd: packageToCmd =
if isList package package: defaultCmd:
then expToLua package if isList package then expToLua package else ''{"${package}/bin/${defaultCmd}"}'';
else ''{"${package}/bin/${defaultCmd}"}'';
servers = { servers = {
nil = { nil = {
package = inputs.nil.packages.${pkgs.stdenv.system}.nil; package = inputs.nil.packages.${pkgs.stdenv.system}.nil;
@ -43,24 +42,20 @@
lspConfig = ''lspconfig.nil_ls.setup ${ lspConfig = ''lspconfig.nil_ls.setup ${
toLuaObject { toLuaObject {
capabilities = mkLuaInline "capabilities"; capabilities = mkLuaInline "capabilities";
on_attach = on_attach = if cfg.format.enable then mkLuaInline "default_on_attach" else "attach_keymaps";
if cfg.format.enable
then mkLuaInline "default_on_attach"
else "attach_keymaps";
cmd = mkLuaInline (packageToCmd cfg.lsp.package "nil"); cmd = mkLuaInline (packageToCmd cfg.lsp.package "nil");
settings.nil = settings.nil = {
{
formatting.command = formatting.command =
if cfg.format.enable if cfg.format.enable then
then if cfg.format.type == "alejandra" then
if cfg.format.type == "alejandra" mkLuaInline ''{"${cfg.format.package}/bin/alejandra", "--quiet"}''
then ''{"${cfg.format.package}/bin/alejandra", "--quiet"}'' else if cfg.format.type == "nixfmt" then
else if cfg.format.type == "nixfmt" mkLuaInline ''{"${cfg.format.package}/bin/nixfmt"}''
then ''{"${cfg.format.package}/bin/nixfmt"}'' else
else null null
else null; else
} null;
// cfg.lsp.options; } // cfg.lsp.options;
} }
}''; }'';
# lspConfig = '' # lspConfig = ''
@ -99,11 +94,7 @@
lspConfig = '' lspConfig = ''
lspconfig.nixd.setup{ lspconfig.nixd.setup{
capabilities = capabilities, capabilities = capabilities,
${ ${if cfg.format.enable then useFormat else noFormat},
if cfg.format.enable
then useFormat
else noFormat
},
cmd = ${packageToCmd cfg.lsp.package "nixd"}, cmd = ${packageToCmd cfg.lsp.package "nixd"},
${optionalString cfg.format.enable '' ${optionalString cfg.format.enable ''
settings = { settings = {
@ -167,23 +158,20 @@
''; '';
}; };
}; };
in { in
{
options.vim.languages.nix = { options.vim.languages.nix = {
enable = mkEnableOption "Nix language support"; enable = mkEnableOption "Nix language support";
treesitter = { treesitter = {
enable = enable = mkEnableOption "Nix treesitter" // {
mkEnableOption "Nix treesitter"
// {
default = config.vim.languages.enableTreesitter; default = config.vim.languages.enableTreesitter;
}; };
package = mkGrammarOption pkgs "nix"; package = mkGrammarOption pkgs "nix";
}; };
lsp = { lsp = {
enable = enable = mkEnableOption "Nix LSP support" // {
mkEnableOption "Nix LSP support"
// {
default = config.vim.lsp.enable; default = config.vim.lsp.enable;
}; };
server = mkOption { server = mkOption {
@ -207,9 +195,7 @@ in {
}; };
format = { format = {
enable = enable = mkEnableOption "Nix formatting" // {
mkEnableOption "Nix formatting"
// {
default = config.vim.languages.enableFormat; default = config.vim.languages.enableFormat;
}; };
@ -227,9 +213,7 @@ in {
}; };
extraDiagnostics = { extraDiagnostics = {
enable = enable = mkEnableOption "extra Nix diagnostics" // {
mkEnableOption "extra Nix diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics; default = config.vim.languages.enableExtraDiagnostics;
}; };
@ -288,8 +272,7 @@ in {
linters = mkMerge ( linters = mkMerge (
map (name: { map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package; ${name}.cmd = getExe diagnosticsProviders.${name}.package;
}) }) cfg.extraDiagnostics.types
cfg.extraDiagnostics.types
); );
}; };
}) })