update: neovim lsp

This commit is contained in:
DACHXY 2025-01-03 01:33:15 +08:00
parent e63917ca85
commit 43e394c86a
14 changed files with 244 additions and 128 deletions

View file

@ -1,12 +1,9 @@
{ pkgs, ... }:
let configDir = ../config;
{ ... }:
let
configDir = ../config;
in
{
home.file = {
# ".config/nvim" = {
# source = "${configDir}/nvim";
# recursive = true;
# };
".config/wallpapers".source = "${configDir}/wallpapers";
".config/kitty".source = "${configDir}/kitty";
".config/neofetch".source = "${configDir}/neofetch";

View file

@ -1,10 +1,14 @@
let
userName = "dachxy";
email = "Danny10132024@gmail.com";
in {
in
{
programs.git = {
enable = true;
userName = userName;
userEmail = email;
extraConfig = {
safe.directory = [ "/etc/nixos" ];
};
};
}

View file

@ -1,33 +1,35 @@
{ pkgs, ... }:
let
treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
p.bash
p.comment
p.css
p.dockerfile
p.fish
p.gitattributes
p.gitignore
p.go
p.gomod
p.gowork
p.hcl
p.javascript
p.jq
p.json5
p.json
p.lua
p.make
p.markdown
p.nix
p.python
p.rust
p.toml
p.typescript
p.vue
p.yaml
]));
treesitterWithGrammars = (
pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
p.bash
p.comment
p.css
p.dockerfile
p.fish
p.gitattributes
p.gitignore
p.go
p.gomod
p.gowork
p.hcl
p.javascript
p.jq
p.json5
p.json
p.lua
p.make
p.markdown
p.nix
p.python
p.rust
p.toml
p.typescript
p.vue
p.yaml
])
);
treesitter-parsers = pkgs.symlinkJoin {
name = "treesitter-parsers";
@ -36,13 +38,20 @@ let
configDir = ../config;
in
{
# Other Lsp servers are defined in system/module/lsp.nix
home.packages = with pkgs; [
ripgrep
fd
lua-language-server
black
nodejs_22
gh
vue-language-server
dockerfile-language-server-nodejs
black
prettierd
javascript-typescript-langserver
marksman
tailwindcss-language-server
ruff
ruff-lsp
pyright
hadolint
];
programs.neovim = {
@ -51,9 +60,13 @@ in
coc.enable = false;
withNodeJs = true;
plugins = [
treesitterWithGrammars
];
plugins =
[
treesitterWithGrammars
]
++ (with pkgs.vimPlugins; [
markdown-preview-nvim
]);
extraPackages = [ pkgs.imagemagick ];
extraLuaPackages = ps: with ps; [ magick ];
};