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

treewide: change modules to use 'inherit (builtins) ...

Browse source
This commit is contained in:
Frothy 2023-11-14 00:18:32 -07:00
commit 4dc7576176
19 changed files with 59 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/languages/bash/bash.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) mkOption mkEnableOption types isList nvim;
cfg = config.vim.languages.bash;
@ -69,7 +70,7 @@ in {
server = mkOption {
description = "Bash LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
@ -89,7 +90,7 @@ in {
};
type = mkOption {
description = "Bash formatter to use";
type = with types; enum (builtins.attrNames formats);
type = with types; enum (attrNames formats);
default = defaultFormat;
};

5
modules/languages/clang.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim optionalString mkEnableOption mkOption types mkIf mkMerge;
cfg = config.vim.languages.clang;
@ -93,7 +94,7 @@ in {
server = mkOption {
description = "The clang LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
@ -119,7 +120,7 @@ in {
};
debugger = mkOption {
description = "clang debugger to use";
type = with types; enum (builtins.attrNames debuggers);
type = with types; enum (attrNames debuggers);
default = defaultDebugger;
};
package = mkOption {

3
modules/languages/dart/dart.nix
View file

@ -4,6 +4,7 @@
pkgs,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim mkEnableOption mkOption types optionalString;
cfg = config.vim.languages.dart;
@ -38,7 +39,7 @@ in {
enable = mkEnableOption "Dart LSP support";
server = mkOption {
description = "The Dart LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
package = mkOption {

5
modules/languages/go.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim getExe mkEnableOption mkOption types mkMerge mkIf;
cfg = config.vim.languages.go;
@ -80,7 +81,7 @@ in {
server = mkOption {
description = "Go LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
@ -100,7 +101,7 @@ in {
};
debugger = mkOption {
description = "Go debugger to use";
type = with types; enum (builtins.attrNames debuggers);
type = with types; enum (attrNames debuggers);
default = defaultDebugger;
};
package = mkOption {

3
modules/languages/nix.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge optionalString;
cfg = config.vim.languages.nix;
@ -146,7 +147,7 @@ in {
type = mkOption {
description = "Nix formatter to use";
type = with types; enum (builtins.attrNames formats);
type = with types; enum (attrNames formats);
default = defaultFormat;
};
package = mkOption {

3
modules/languages/php.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge getExe;
cfg = config.vim.languages.php;
@ -72,7 +73,7 @@ in {
server = mkOption {
description = "PHP LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};

7
modules/languages/python.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge getExe literalExpression;
cfg = config.vim.languages.python;
@ -149,7 +150,7 @@ in {
server = mkOption {
description = "Python LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
@ -166,7 +167,7 @@ in {
type = mkOption {
description = "Python formatter to use";
type = with types; enum (builtins.attrNames formats);
type = with types; enum (attrNames formats);
default = defaultFormat;
};
@ -186,7 +187,7 @@ in {
};
debugger = mkOption {
description = "Python debugger to use";
type = with types; enum (builtins.attrNames debuggers);
type = with types; enum (attrNames debuggers);
default = defaultDebugger;
};
package = mkOption {

5
modules/languages/sql.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge;
cfg = config.vim.languages.sql;
@ -86,7 +87,7 @@ in {
server = mkOption {
description = "SQL LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
@ -103,7 +104,7 @@ in {
type = mkOption {
description = "SQL formatter to use";
type = with types; enum (builtins.attrNames formats);
type = with types; enum (attrNames formats);
default = defaultFormat;
};

5
modules/languages/svelte.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge;
cfg = config.vim.languages.svelte;
@ -72,7 +73,7 @@ in {
server = mkOption {
description = "Svelte LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
@ -89,7 +90,7 @@ in {
type = mkOption {
description = "Svelte formatter to use";
type = with types; enum (builtins.attrNames formats);
type = with types; enum (attrNames formats);
default = defaultFormat;
};

5
modules/languages/ts.nix
View file

@ -4,6 +4,7 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge;
cfg = config.vim.languages.ts;
@ -98,7 +99,7 @@ in {
server = mkOption {
description = "Typescript/Javascript LSP server to use";
type = with types; enum (builtins.attrNames servers);
type = with types; enum (attrNames servers);
default = defaultServer;
};
@ -115,7 +116,7 @@ in {
type = mkOption {
description = "Typescript/Javascript formatter to use";
type = with types; enum (builtins.attrNames formats);
type = with types; enum (attrNames formats);
default = defaultFormat;
};