Compare commits

15 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
c4084faeff nvim/lsp: switch to native LSP configuration built-in 2025-12-01 10:32:29 +01:00
6df3b346eb nvim-ts: remove verilog parser 2025-12-01 01:42:13 +01:00
779475f024 nixpkgs: 25.05 -> 25.11 2025-12-01 01:40:56 +01:00
a595413b88 add: viu, chaffa, ueberzugpp 2025-08-29 13:18:17 +02:00
e205831fd9 add nvim-web-devicons 2025-08-29 13:09:29 +02:00
34fc2804d7 flake: update 2025-08-25 18:15:01 +02:00
b23265403c update 24.11 -> 25.05; typst_lsp -> tinymst 2025-05-24 11:11:17 +02:00
8245a48cc7 add nixfmt to runtime pkgs 2025-01-10 18:03:29 +01:00
3d82bad6ee pkgs: add nixfmt-rfc-style 2025-01-08 18:32:17 +01:00
6e26ec33fa gitignore: update 2024-12-03 23:15:07 +01:00
b9c3cd2e1a gitignore: update 2024-12-03 23:14:02 +01:00
a09a34997c lsp: add typist_lsp 2024-12-03 22:33:03 +01:00
127047caeb lsp: add yaml-lsp-server 2024-12-03 22:24:57 +01:00
5 changed files with 124 additions and 76 deletions

3
.gitignore vendored
View File

@@ -1 +1,4 @@
result
.ccls-cache/
hello.c
compile_commands.json

8
flake.lock generated
View File

@@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1733120037,
"narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
"lastModified": 1764494334,
"narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
"rev": "d542db745310b6929708d9abea513f3ff19b1341",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}

146
flake.nix
View File

@@ -2,73 +2,89 @@
description = "A very basic flake";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
};
outputs = {
self,
nixpkgs,
}: let
supportedSystems = ["x86_64-linux" "aarch64-linux"];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
in {
packages = forAllSystems (system: let
pkgs = nixpkgsFor.${system};
neovim = import ./nvim-lsp.nix {inherit pkgs;};
in {
nvim = pkgs.symlinkJoin {
name = "nvim";
paths = with pkgs;
[
alejandra
ccls
gopls
luaformatter
nixd
pyright
rust-analyzer
sumneko-lua-language-server
svls
texlab
tree-sitter
verible
zls
]
++ [neovim];
};
});
outputs =
{ self
, nixpkgs
,
}:
let
supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
in
{
packages = forAllSystems (system:
let
pkgs = nixpkgsFor.${system};
neovim = import ./nvim-lsp.nix { inherit pkgs; };
in
{
nvim = pkgs.symlinkJoin {
name = "nvim";
paths = with pkgs;
[
alejandra
ccls
gopls
luaformatter
nixd
nixfmt-rfc-style
pyright
rust-analyzer
lua-language-server
svls
texlab
tree-sitter
tinymist
verible
yaml-language-server
zls
viu
chafa
ueberzugpp
]
++ [ neovim ];
};
});
devShells = forAllSystems (system: let
pkgs = nixpkgsFor.${system};
in {
default = pkgs.mkShell {
nativeBuildInputs = [
pkgs.alejandra
pkgs.ccls
pkgs.gopls
pkgs.luaformatter
pkgs.nixd
pkgs.pyright
pkgs.rust-analyzer
pkgs.sumneko-lua-language-server
pkgs.svls
pkgs.texlab
pkgs.tree-sitter
pkgs.verible
pkgs.zls
(import ./nvim-lsp.nix {inherit pkgs;})
];
};
});
devShells = forAllSystems (system:
let
pkgs = nixpkgsFor.${system};
in
{
default = pkgs.mkShell {
nativeBuildInputs = [
pkgs.alejandra
pkgs.ccls
pkgs.gopls
pkgs.luaformatter
pkgs.nixd
pkgs.nixfmt-rfc-style
pkgs.pyright
pkgs.rust-analyzer
pkgs.lua-language-server
pkgs.svls
pkgs.texlab
pkgs.tree-sitter
pkgs.verible
pkgs.zls
(import ./nvim-lsp.nix { inherit pkgs; })
];
};
});
overlays = forAllSystems (system: let
pkgs = nixpkgsFor.${system};
in {
overlay = final: prev: {
nvim = self.packages.${system}.nvim;
};
});
defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
};
overlays = forAllSystems (system:
let
pkgs = nixpkgsFor.${system};
in
{
overlay = final: prev: {
nvim = self.packages.${system}.nvim;
};
});
defaultPackage = forAllSystems (system: self.packages.${system}.nvim);
};
}

View File

@@ -19,7 +19,6 @@
parsers.python
parsers.query
parsers.rust
parsers.verilog
parsers.vimdoc
parsers.zig
]))
@@ -44,6 +43,7 @@
vim-slime
vim-snippets
zig-vim
nvim-web-devicons
];
};
};

View File

@@ -34,7 +34,7 @@ require 'nvim-treesitter.configs'.setup {
enable = true,
extended_mode = true,
max_file_lines = 1000,
colors = { '#ff0000', '#0051a0' ,'#ffa500', '#ffff00', '#008000', '#8003f2' }
colors = { '#ff0000', '#0051a0', '#ffa500', '#ffff00', '#008000', '#8003f2' }
}
}
@@ -182,15 +182,42 @@ cmp.setup({
}
})
local servers = { 'pyright', 'rust_analyzer', 'ccls', 'nixd', 'texlab', 'zls', 'gopls' }
local servers = { 'pyright', 'rust_analyzer', 'ccls', 'texlab', 'zls', 'gopls', 'yamlls' }
local capabilities = require('cmp_nvim_lsp').default_capabilities()
for _, lsp in pairs(servers) do
require('lspconfig')[lsp].setup {
vim.lsp.config(lsp, {
capabilities = capabilities
}
})
vim.lsp.enable(lsp)
end
require('lspconfig').lua_ls.setup({
vim.lsp.config('nixd', {
cmd = { "nixd" },
settings = {
nixd = {
nixpkgs = {
expr = 'import "${flake.inputs.nixpkgs}" { }',
},
formatting = {
command = { "nixpkgs-fmt" },
},
options = {
nixos = {
expr =
'(let pkgs = import "${inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${inputs.nixpkgs}/nixos/modules/module-list.nix") ++ [ ({...}: { nixpkgs.hostPlatform = builtins.currentSystem;} ) ] ; })).options',
},
home_manager = {
expr =
'(let pkgs = import "${inputs.nixpkgs}" { }; lib = import "${inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${inputs.home-manager}/modules/modules.nix") { inherit lib pkgs; check = false; }; })).options',
},
},
},
},
})
vim.lsp.enable('nixd');
vim.lsp.config('lua_ls', {
capabilities = capabilities,
single_file_support = true,
settings = {
@@ -214,11 +241,13 @@ require('lspconfig').lua_ls.setup({
},
},
})
vim.lsp.enable('lua_ls');
require('lspconfig').verible.setup({
vim.lsp.config('verible', {
capabilities = capabilities,
root_dir = function() return vim.fn.getcwd() end
})
vim.lsp.enable('verible');
if vim.fn.exists('+undofile') ~= 0 then
local undo_dir = vim.env.HOME .. '/.config/nvim/undo'