From caa177c91fdb27c06d40b93e2c78e3b014b95877 Mon Sep 17 00:00:00 2001
From: QuiNzX <quinzx3@gmail.com>
Date: Mon, 20 Jan 2025 16:44:59 +0100
Subject: [PATCH] rename: packages -> package & lsp server options

---
 configuration.nix                    |  2 +-
 modules/plugins/languages/python.nix | 38 ++++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index babf0589..7f85c4ba 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -62,7 +62,7 @@ isMaximal: {
       python = {
         enable = true;
         format.type = "ruff";
-        lsp.servers = ["ruff" "basedpyright"];
+        lsp.server = ["ruff" "basedpyright"];
       };
       typst.enable = isMaximal;
       rust = {
diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 625c26ab..2f8afc1f 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -15,7 +15,7 @@
   cfg = config.vim.languages.python;
 
   defaultServer = ["basedpyright"];
-  servers = {
+  server = {
     pyright = {
       package = pkgs.pyright;
       lspConfig = ''
@@ -23,9 +23,9 @@
           capabilities = capabilities;
           on_attach = default_on_attach;
           cmd = ${
-          if isList cfg.lsp.packages.pyright
-          then expToLua cfg.lsp.packages.pyright
-          else ''{"${cfg.lsp.packages.pyright}/bin/pyright-langserver", "--stdio"}''
+          if isList cfg.lsp.package.pyright
+          then expToLua cfg.lsp.package.pyright
+          else ''{"${cfg.lsp.package.pyright}/bin/pyright-langserver", "--stdio"}''
         }
         }
       '';
@@ -38,9 +38,9 @@
           capabilities = capabilities;
           on_attach = default_on_attach;
           cmd = ${
-          if isList cfg.lsp.packages.basedpyright
-          then expToLua cfg.lsp.packages.basedpyright
-          else ''{"${cfg.lsp.packages.basedpyright}/bin/basedpyright-langserver", "--stdio"}''
+          if isList cfg.lsp.package.basedpyright
+          then expToLua cfg.lsp.package.basedpyright
+          else ''{"${cfg.lsp.package.basedpyright}/bin/basedpyright-langserver", "--stdio"}''
         }
         }
       '';
@@ -53,9 +53,9 @@
           capabilities = capabilities;
           on_attach = default_on_attach;
           cmd = ${
-          if isList cfg.lsp.packages.ruff
-          then expToLua cfg.lsp.packages.ruff
-          else ''{"${cfg.lsp.packages.ruff}/bin/ruff", "server"}''
+          if isList cfg.lsp.package.ruff
+          then expToLua cfg.lsp.package.ruff
+          else ''{"${cfg.lsp.package.ruff}/bin/ruff", "server"}''
         }
         }
       '';
@@ -68,9 +68,9 @@
           capabilities = capabilities;
           on_attach = default_on_attach;
           cmd = ${
-          if isList cfg.lsp.packages.pylsp
-          then expToLua cfg.lsp.packages.pylsp
-          else ''{"${cfg.lsp.packages}/bin/pylsp"}''
+          if isList cfg.lsp.package.pylsp
+          then expToLua cfg.lsp.package.pylsp
+          else ''{"${cfg.lsp.package}/bin/pylsp"}''
         }
         }
       '';
@@ -219,17 +219,17 @@ in {
     lsp = {
       enable = mkEnableOption "Python LSP support" // {default = config.vim.languages.enableLSP;};
 
-      servers = mkOption {
+      server = mkOption {
         description = "Python LSP server to use";
-        type = listOf (enum (attrNames servers));
+        type = listOf (enum (attrNames server));
         default = defaultServer;
       };
 
-      packages = mkOption {
+      package = mkOption {
         description = "python LSP server package, or the command to run as a list of strings";
         example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
         type = lib.types.attrsOf (either package (listOf str));
-        default = lib.genAttrs cfg.lsp.servers (name: servers.${name}.package);
+        default = lib.genAttrs cfg.lsp.server (name: server.${name}.package);
       };
     };
 
@@ -285,8 +285,8 @@ in {
       vim.lsp.lspconfig.enable = true;
       vim.lsp.lspconfig.sources =
         lib.genAttrs
-        cfg.lsp.servers
-        (name: servers.${name}.lspConfig);
+        cfg.lsp.server
+        (name: server.${name}.lspConfig);
     })
 
     (mkIf cfg.format.enable {