From cbda2a2379bdf5622005d9347ca7722d20a3e3e4 Mon Sep 17 00:00:00 2001
From: QuiNzX <lan.sloterdijk@gmail.com>
Date: Sat, 25 Jan 2025 20:40:10 +0100
Subject: [PATCH] change: update inline inherit statements

---
 docs/release-notes/rl-0.8.md         |  2 +-
 modules/plugins/languages/python.nix | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 657bc3c9..1680b7c5 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -126,7 +126,7 @@
 
 [QuiNzX](https://github.com/QuiNzX):
 
-[ruff lsp]: (https://github.com/astral-sh/ruff)
+[ruff]: (https://github.com/astral-sh/ruff)
 
 - Add ruff as lsp alongside other lsp servers in a list as an option. Under
   `vim.languages.python.lsp.server`.
diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 998cd81b..62db0a46 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -8,9 +8,10 @@
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str bool;
+  inherit (lib.lists) isList toList;
+  inherit (lib.types) enum either listOf package str bool attrsOf;
   inherit (lib.nvim.lua) expToLua;
+  inherit (lib) genAttrs;
 
   cfg = config.vim.languages.python;
 
@@ -232,8 +233,8 @@ in {
       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 (lib.toList cfg.lsp.server) (name: servers.${name}.package);
+        type = attrsOf (either package (listOf str));
+        default = genAttrs (toList cfg.lsp.server) (name: servers.${name}.package);
       };
     };
 
@@ -287,7 +288,7 @@ in {
 
     (mkIf cfg.lsp.enable {
       vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources = lib.genAttrs (lib.toList cfg.lsp.server) (name: servers.${name}.lspConfig);
+      vim.lsp.lspconfig.sources = genAttrs (toList cfg.lsp.server) (name: servers.${name}.lspConfig);
     })
 
     (mkIf cfg.format.enable {