diff --git a/common/home/neovim/langs/markdown.nix b/common/home/neovim/langs/markdown.nix index 0be9fc8..2fc713f 100644 --- a/common/home/neovim/langs/markdown.nix +++ b/common/home/neovim/langs/markdown.nix @@ -19,6 +19,7 @@ in neovim = { plugins = [ vimPlugins.markdown-preview-nvim + { plugin = buildPlugin "easytables-nvim" vimplugin-easytables-src; type = "lua"; diff --git a/common/home/neovim/langs/python.nix b/common/home/neovim/langs/python.nix index fd24cb8..a998e9f 100644 --- a/common/home/neovim/langs/python.nix +++ b/common/home/neovim/langs/python.nix @@ -2,22 +2,28 @@ config, lib, pkgs, + basedpyright, ... }: let inherit (config.vars) neovimIde; - inherit (pkgs) vimPlugins; in lib.mkIf neovimIde { programs = { neovim = { withPython3 = true; - extraPython3Packages = ps: [ - ps.pylint + extraPackages = [ + basedpyright.legacyPackages.${pkgs.system}.basedpyright ]; - plugins = [ - ]; + extraLuaConfig = + /* + lua + */ + '' + require('lspconfig').basedpyright.setup( + require('coq').lsp_ensure_capabilities({})); + ''; }; }; } diff --git a/flake.lock b/flake.lock index 35299aa..5ebb85e 100644 --- a/flake.lock +++ b/flake.lock @@ -83,6 +83,22 @@ "type": "github" } }, + "basedpyright": { + "locked": { + "lastModified": 1715279725, + "narHash": "sha256-dy+5OXWNvz7tFIXdbP72baRxkdqSywATNsHcYDxGfHw=", + "owner": "kiike", + "repo": "nixpkgs", + "rev": "695099b46a475665c25a2d1851d25e92c2711dcb", + "type": "github" + }, + "original": { + "owner": "kiike", + "ref": "pkgs/basedpyright", + "repo": "nixpkgs", + "type": "github" + } + }, "bat-theme-src": { "flake": false, "locked": { @@ -1686,6 +1702,7 @@ "ags": "ags", "arion": "arion", "astal": "astal", + "basedpyright": "basedpyright", "bat-theme-src": "bat-theme-src", "caddy-plugins": "caddy-plugins", "curseforge-server-downloader-src": "curseforge-server-downloader-src", diff --git a/flake.nix b/flake.nix index 0d0aab0..e0d6ae0 100644 --- a/flake.nix +++ b/flake.nix @@ -349,6 +349,7 @@ owner = "nix-community"; repo = "nixd"; }; + basedpyright.url = "github:kiike/nixpkgs/pkgs/basedpyright"; vimplugin-easytables-src = { type = "github";