Compare commits
3 commits
a5c4375d05
...
3ea29b1f8b
Author | SHA1 | Date | |
---|---|---|---|
|
3ea29b1f8b | ||
ea68d8de0b | |||
b75e7c94f5 |
3 changed files with 59 additions and 14 deletions
6
flake.lock
generated
6
flake.lock
generated
|
@ -181,11 +181,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736344531,
|
"lastModified": 1737062831,
|
||||||
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
|
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -120,7 +120,8 @@ with final.pkgs.lib; let
|
||||||
# ^ bleeding-edge plugins from flake inputs
|
# ^ bleeding-edge plugins from flake inputs
|
||||||
];
|
];
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs;
|
||||||
|
[
|
||||||
# Dependencies
|
# Dependencies
|
||||||
ripgrep
|
ripgrep
|
||||||
|
|
||||||
|
@ -128,9 +129,17 @@ with final.pkgs.lib; let
|
||||||
asm-lsp # Assembly language server
|
asm-lsp # Assembly language server
|
||||||
clang-tools # C/C++ language server
|
clang-tools # C/C++ language server
|
||||||
(callPackage ./cpptools.nix {}) # C/C++ debugger from VSCode | https://github.com/microsoft/vscode-cpptools
|
(callPackage ./cpptools.nix {}) # C/C++ debugger from VSCode | https://github.com/microsoft/vscode-cpptools
|
||||||
|
nil # nix LSP
|
||||||
nodePackages.bash-language-server # Bash language server
|
nodePackages.bash-language-server # Bash language server
|
||||||
lua-language-server
|
lua-language-server
|
||||||
nil # nix LSP
|
]
|
||||||
|
++ [
|
||||||
|
(pkgs.python312.withPackages (python-pkgs: [
|
||||||
|
python-pkgs.python-lsp-server
|
||||||
|
python-pkgs.python-lsp-ruff
|
||||||
|
python-pkgs.pylsp-mypy
|
||||||
|
python-pkgs.pylsp-rope
|
||||||
|
]))
|
||||||
];
|
];
|
||||||
in {
|
in {
|
||||||
# This is the neovim derivation
|
# This is the neovim derivation
|
||||||
|
|
36
nvim/ftplugin/python.lua
Normal file
36
nvim/ftplugin/python.lua
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
-- Exit if the language server isn't available
|
||||||
|
if vim.fn.executable('pylsp') ~= 1 then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local root_files = {
|
||||||
|
'pyproject.toml',
|
||||||
|
'setup.py',
|
||||||
|
'setup.cfg',
|
||||||
|
'requirements.txt',
|
||||||
|
'Pipfile',
|
||||||
|
'pyrightconfig.json',
|
||||||
|
'.git',
|
||||||
|
}
|
||||||
|
|
||||||
|
vim.lsp.start({
|
||||||
|
name = 'python-lsp-server',
|
||||||
|
cmd = { "pylsp" },
|
||||||
|
root_dir = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]),
|
||||||
|
capabilities = require('user.lsp').make_client_capabilities(),
|
||||||
|
filetypes = { 'python' },
|
||||||
|
on_attach = function(client, bufnr)
|
||||||
|
require("nvim-navic").attach(client, bufnr)
|
||||||
|
require("workspace-diagnostics").populate_workspace_diagnostics(client, bufnr)
|
||||||
|
end,
|
||||||
|
settings = {
|
||||||
|
pylsp = {
|
||||||
|
plugins = {
|
||||||
|
mypy = { enabled = true, },
|
||||||
|
rope = { enabled = true, },
|
||||||
|
ruff = { enabled = true, },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
single_file_support = true
|
||||||
|
})
|
Loading…
Add table
Add a link
Reference in a new issue