Compare commits

2 Commits

Author SHA1 Message Date
878c87430f nvim/lsp: fix server not beeing enabled; remove tinymist 2025-12-01 14:12:20 +01:00
0147f451a8 meta: format 2025-12-01 14:11:58 +01:00
2 changed files with 84 additions and 72 deletions

View File

@@ -5,18 +5,23 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
}; };
outputs = { outputs =
self, { self
nixpkgs, , nixpkgs
}: let ,
supportedSystems = ["x86_64-linux" "aarch64-linux"]; }:
let
supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems; forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
in { in
packages = forAllSystems (system: let {
packages = forAllSystems (system:
let
pkgs = nixpkgsFor.${system}; pkgs = nixpkgsFor.${system};
neovim = import ./nvim-lsp.nix {inherit pkgs;}; neovim = import ./nvim-lsp.nix { inherit pkgs; };
in { in
{
nvim = pkgs.symlinkJoin { nvim = pkgs.symlinkJoin {
name = "nvim"; name = "nvim";
paths = with pkgs; paths = with pkgs;
@@ -41,13 +46,15 @@
chafa chafa
ueberzugpp ueberzugpp
] ]
++ [neovim]; ++ [ neovim ];
}; };
}); });
devShells = forAllSystems (system: let devShells = forAllSystems (system:
let
pkgs = nixpkgsFor.${system}; pkgs = nixpkgsFor.${system};
in { in
{
default = pkgs.mkShell { default = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.alejandra pkgs.alejandra
@@ -64,14 +71,16 @@
pkgs.tree-sitter pkgs.tree-sitter
pkgs.verible pkgs.verible
pkgs.zls pkgs.zls
(import ./nvim-lsp.nix {inherit pkgs;}) (import ./nvim-lsp.nix { inherit pkgs; })
]; ];
}; };
}); });
overlays = forAllSystems (system: let overlays = forAllSystems (system:
let
pkgs = nixpkgsFor.${system}; pkgs = nixpkgsFor.${system};
in { in
{
overlay = final: prev: { overlay = final: prev: {
nvim = self.packages.${system}.nvim; nvim = self.packages.${system}.nvim;
}; };

View File

@@ -182,7 +182,7 @@ cmp.setup({
} }
}) })
local servers = { 'pyright', 'rust_analyzer', 'ccls', 'texlab', 'zls', 'gopls', 'yamlls', 'tinymst' } local servers = { 'pyright', 'rust_analyzer', 'ccls', 'texlab', 'zls', 'gopls', 'yamlls' }
local capabilities = require('cmp_nvim_lsp').default_capabilities() local capabilities = require('cmp_nvim_lsp').default_capabilities()
for _, lsp in pairs(servers) do for _, lsp in pairs(servers) do
vim.lsp.config(lsp, { vim.lsp.config(lsp, {
@@ -215,6 +215,7 @@ vim.lsp.config('nixd', {
}, },
}, },
}) })
vim.lsp.enable('nixd');
vim.lsp.config('lua_ls', { vim.lsp.config('lua_ls', {
capabilities = capabilities, capabilities = capabilities,
@@ -240,11 +241,13 @@ vim.lsp.config('lua_ls', {
}, },
}, },
}) })
vim.lsp.enable('lua_ls');
vim.lsp.config('verible', { vim.lsp.config('verible', {
capabilities = capabilities, capabilities = capabilities,
root_dir = function() return vim.fn.getcwd() end root_dir = function() return vim.fn.getcwd() end
}) })
vim.lsp.enable('verible');
if vim.fn.exists('+undofile') ~= 0 then if vim.fn.exists('+undofile') ~= 0 then
local undo_dir = vim.env.HOME .. '/.config/nvim/undo' local undo_dir = vim.env.HOME .. '/.config/nvim/undo'