pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

nvim: remove pylsp for pyright

pull/7/head
Pegasust 2023-01-19 13:30:25 -08:00
parent 295166292a
commit 81fa580d0c
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -112,9 +112,9 @@
hosts.path = "${path}/hosts"; hosts.path = "${path}/hosts";
users.path = "${path}/users"; users.path = "${path}/users";
}; };
pkgs = import nixpkgs {
inherit system;
overlays = import ./overlays.nix (_inputs // {inherit system;}); overlays = import ./overlays.nix (_inputs // {inherit system;});
pkgs = import nixpkgs {
inherit system overlays;
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
@ -125,7 +125,7 @@
nixpkgs.lib nixpkgs.lib
pkgs.lib pkgs.lib
(import ./lib { (import ./lib {
inherit proj_root pkgs system; inherit proj_root pkgs overlays system;
inherit (pkgs) lib; inherit (pkgs) lib;
}) })
]); ]);

2
native_configs/neovim/init.lua
View File

@ -607,7 +607,7 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities()
-- default language servers -- default language servers
local servers = { local servers = {
'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'cmake', 'tailwindcss', 'prismals', 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'cmake', 'tailwindcss', 'prismals',
'rnix', 'eslint', 'terraformls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls", 'yamlls', "pylsp", 'rnix', 'eslint', 'terraformls', 'tflint', 'svelte', 'astro', 'clojure_lsp', "bashls", 'yamlls',
"jsonls", "denols" "jsonls", "denols"
} }
require("mason").setup({ require("mason").setup({

12
nix-conf/home-manager/base/neovim.nix
View File

@ -47,20 +47,16 @@ let
# Language-specific stuffs # Language-specific stuffs
pkgs.sumneko-lua-language-server pkgs.sumneko-lua-language-server
# pkgs.python3Packages.python-lsp-server
pkgs.nodePackages.pyright
pkgs.python3Packages.pylint
pkgs.python3Packages.flake8
# TODO: the devShell should provide rust-analyzer so that # TODO: the devShell should provide rust-analyzer so that
# cargo test builds binaries compatible with rust-analyzer # cargo test builds binaries compatible with rust-analyzer
# pkgs.rust-analyzer # pkgs.rust-analyzer
# rust_pkgs # rust_pkgs
# pkgs.evcxr # Rust REPL for Conjure! # pkgs.evcxr # Rust REPL for Conjure!
# Python3 as alternative to bash scripts :^)
# (pkgs.python310Full.withPackages (pypkgs: [
# # python-lsp-server's dependencies is absolutely astronomous
# # pypkgs.python-lsp-server # python-lsp. Now we'll have to tell mason to look for this
# pypkgs.pynvim # nvim provider
# pypkgs.ujson # pylsp seems to rely on this. satisfy it lol
# ]))
]; ];
in in
{ {

8
nix-conf/home-manager/flake.nix
View File

@ -2,6 +2,14 @@
nixConfig = { nixConfig = {
accept-flake-config = true; accept-flake-config = true;
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";
extra-substituters = [
"https://nix-community.cachix.org"
"https://cache.nixos.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
];
}; };
description = "simple home-manager config"; description = "simple home-manager config";
inputs = { inputs = {