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

simplify and remove unnecessary stuff

Browse source
This commit is contained in:
sjcobb 2025-05-22 14:48:14 +01:00
commit 7ae81ca51b
3 changed files with 27 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,15 +6,14 @@
}: let
inherit (builtins) attrNames;
inherit (lib) concatStringsSep;
inherit (lib.generators) mkLuaInline;
inherit (lib.meta) getExe;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) isList;
inherit (lib.types) enum package;
inherit (lib.types) enum package listOf;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.lua) expToLua;
inherit (lib.nvim.languages) resolveLspOptions mkLspOption;
cfg = config.vim.languages.nix;
@ -23,18 +22,18 @@
then expToLua package
else ''{"${package}/bin/${defaultCmd}"}'';
formattingCmd = lib.mkIf (cfg.format.enable && cfg.lsp.enable) {
formatting = lib.mkMerge [
(lib.mkIf (cfg.format.type == "alejandra") {
formattingCmd = mkIf (cfg.format.enable && cfg.lsp.enable) {
formatting = mkMerge [
(mkIf (cfg.format.type == "alejandra") {
command = ["${cfg.format.package}/bin/alejandra" "--quiet"];
})
(lib.mkIf (cfg.format.type == "nixfmt") {
(mkIf (cfg.format.type == "nixfmt") {
command = ["${cfg.format.package}/bin/nixfmt"];
})
];
};
defaultServers = ["nil_ls"]
defaultServers = ["nil_ls"];
servers = {
nil_ls = {
enable = true;
@ -101,9 +100,11 @@ in {
lsp = {
enable = mkEnableOption "Nix LSP support" // {default = config.vim.lsp.enable;};
servers = mkLspOption {
inherit servers;
servers = mkOption {
description = "Nix LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
example = ["nixd"];
};
};
@ -153,14 +154,14 @@ in {
})
(mkIf cfg.lsp.enable {
# TODO: Map this to include lspconfig stuff so that we can do
vim.lsp.servers = resolveLspOptions {
inherit servers;
selected = cfg.lsp.servers;
};
vim.lsp.servers =
mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
})
# TODO: Figure out what do here. This is not necessarily correct as other lsps might not have formatting by default
(mkIf (cfg.format.enable && !cfg.lsp.enable) {
vim.formatter.conform-nvim = {
enable = true;