Compare commits

..

No commits in common. "b1028bc4d31cfba7ad7b28d6525ddefea85c4d00" and "4e04b1c8fadfebda2d96bdbb0eaf5e28fc917171" have entirely different histories.

4 changed files with 45 additions and 109 deletions

View file

@ -1,36 +1,46 @@
# LSP setup
{ pkgs, inputs, ... }:
{ pkgs, ... }:
{
extraPackages = with pkgs; [
rust-analyzer
lua-language-server
];
plugins = {
lsp = {
enable = true;
inlayHints = true;
servers = {
bashls.enable = true;
clangd.enable = true;
pyright.enable = true;
nixd.enable = true;
nushell.enable = true;
svelte.enable = true;
tailwindcss.enable = true;
typst-lsp.enable = true;
marksman.enable = true;
};
plugins.lsp = {
enable = true;
inlayHints = true;
servers = {
bashls.enable = true;
clangd.enable = true;
pyright.enable = true;
nixd.enable = true;
nushell.enable = true;
svelte.enable = true;
tailwindcss.enable = true;
typst-lsp.enable = true;
marksman.enable = true;
};
typescript-tools.enable = true;
lsp-lines.enable = true;
rustaceanvim.enable = true;
};
plugins.typescript-tools.enable = true;
plugins.lsp-lines.enable = true;
extraPlugins = [
(pkgs.vimUtils.buildVimPlugin {
name = "haskell-tools-nvim";
src = inputs.haskell-tools;
src = pkgs.fetchFromGitHub {
owner = "mrcjkb";
repo = "haskell-tools.nvim";
rev = "959eac0fadbdd27442904a8cb363f39afb528027";
hash = "sha256-5CS5kvUSqQJe7iFFpicinBjCQXgFPL0ElGgnrZHTT+Y=";
};
})
(pkgs.vimUtils.buildVimPlugin {
name = "rustaceanvim";
src = pkgs.fetchFromGitHub {
owner = "mrcjkb";
repo = "rustaceanvim";
rev = "7cba8e599deca98d4b44cac1bcbd720c62937d90";
hash = "sha256-OYfeJuo4FZUBdW9wGGCT0lZGYr/ur1uy8frcyUJMF3k=";
};
})
];
}

View file

@ -1,5 +1,5 @@
# Quality of life plugins
{ pkgs, inputs, ... }:
{ pkgs, ... }:
{
extraPackages = with pkgs; [
ripgrep
@ -33,11 +33,21 @@
extraPlugins = [
(pkgs.vimUtils.buildVimPlugin {
name = "satellite.nvim";
src = inputs.satellite;
src = pkgs.fetchFromGitHub {
owner = "lewis6991";
repo = "satellite.nvim";
rev = "777ed56e1ef45ec808df701730b6597fc4fb0fbc";
hash = "sha256-04Js+9SB4VuCq/ACbNh5BZcolu8i8vlGU72qo5xxfpk=";
};
})
(pkgs.vimUtils.buildVimPlugin {
name = "render-markdown.nvim";
src = inputs.render-markdown;
src = pkgs.fetchFromGitHub {
owner = "MeanderingProgrammer";
repo = "render-markdown.nvim";
rev = "7986be47531d652e950776536987e01dd5b55b94";
hash = "sha256-lc++IrXzEA3M2iUFZACAZOcH2EwVqX4p0fhET+en37o=";
};
})
];
}

View file

@ -144,22 +144,6 @@
"type": "github"
}
},
"haskell-tools": {
"flake": false,
"locked": {
"lastModified": 1725935019,
"narHash": "sha256-M+AcprniBOBQFkhXCacAyBtFF5FZyGSG5F6e8ld+r9c=",
"owner": "mrcjkb",
"repo": "haskell-tools.nvim",
"rev": "2443c3b2ab049561009d1b5712e839db546b6586",
"type": "github"
},
"original": {
"owner": "mrcjkb",
"repo": "haskell-tools.nvim",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -280,63 +264,11 @@
"type": "github"
}
},
"render-markdown": {
"flake": false,
"locked": {
"lastModified": 1726165713,
"narHash": "sha256-6EoJWKXePglg8hiErp1VOaI/xmYFonthHZL4s96fZXc=",
"owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim",
"rev": "cb935afe5bb52965e2bfc11cf7b563bb159ef4f5",
"type": "github"
},
"original": {
"owner": "MeanderingProgrammer",
"repo": "render-markdown.nvim",
"type": "github"
}
},
"root": {
"inputs": {
"flake-parts": "flake-parts",
"haskell-tools": "haskell-tools",
"nixpkgs": "nixpkgs",
"nixvim": "nixvim",
"render-markdown": "render-markdown",
"rustaceanvim": "rustaceanvim",
"satellite": "satellite"
}
},
"rustaceanvim": {
"flake": false,
"locked": {
"lastModified": 1726158967,
"narHash": "sha256-wZ8SZjHSU1WnhkKx2hXgI5pLRSglOM52kOtJbB3QCds=",
"owner": "mrcjkb",
"repo": "rustaceanvim",
"rev": "5610d5e01dc803717cc0b6b87625f2fbb548b49e",
"type": "github"
},
"original": {
"owner": "mrcjkb",
"repo": "rustaceanvim",
"type": "github"
}
},
"satellite": {
"flake": false,
"locked": {
"lastModified": 1725437627,
"narHash": "sha256-5WMKEsS9e9nTuylZ5pRPIW+G/52HKC1bjSdz3GvJg+8=",
"owner": "lewis6991",
"repo": "satellite.nvim",
"rev": "dfc2b220f4969ebc49b0f2a94ab6faae240705bd",
"type": "github"
},
"original": {
"owner": "lewis6991",
"repo": "satellite.nvim",
"type": "github"
"nixvim": "nixvim"
}
},
"systems": {

View file

@ -6,19 +6,6 @@
nixvim.url = "github:nix-community/nixvim";
nixvim.inputs.nixpkgs.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts";
render-markdown = {
url = "github:MeanderingProgrammer/render-markdown.nvim";
flake = false;
};
satellite = {
url = "github:lewis6991/satellite.nvim";
flake = false;
};
haskell-tools = {
url = "github:mrcjkb/haskell-tools.nvim";
flake = false;
};
};
outputs =
@ -46,9 +33,6 @@
nixvim' = nixvim.legacyPackages.${system};
nixvimModule = {
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
};
module = import ./config;
};
nvim = nixvim'.makeNixvimWithModule nixvimModule;