matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor(nvim): remove riscv syntax highlight and make nixd happy
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-05-04 19:14:13 -04:00
parent 23acd9ef5d
commit e56ccb5a97
3 changed files with 132 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

246
common/home/neovim/default.nix
View file

@ -6,11 +6,17 @@
coc-stylelintplus, coc-stylelintplus,
nixd, nixd,
vimplugin-easytables-src, vimplugin-easytables-src,
vimplugin-riscv-src,
... ...
}: let }: let
inherit (config.vars) hostName mainUser neovimIde; inherit (config.vars) hostName mainUser neovimIde;
inherit (lib) fileContents hasPrefix optionalAttrs optionals removePrefix; inherit (lib) fileContents hasPrefix optionalAttrs optionals removePrefix;
inherit (pkgs) vimPlugins;
buildPlugin = pname: src:
pkgs.vimUtils.buildVimPlugin {
inherit pname src;
version = src.shortRev;
};
javaSdk = pkgs.temurin-bin-17; javaSdk = pkgs.temurin-bin-17;
coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default; coc-stylelintplus-flake = coc-stylelintplus.packages.${pkgs.system}.default;
@ -81,18 +87,21 @@ in {
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
extraPackages = with pkgs; ([ extraPackages =
(with pkgs; [
bat bat
gcc gcc
] ])
++ optionals neovimIde [ ++ (optionals neovimIde [
clang-tools nixdPkg
nodejs_latest ]
nodePackages.npm ++ (with pkgs; [
nodePackages.neovim clang-tools
gradle nodejs_latest
nixdPkg nodePackages.npm
]); nodePackages.neovim
gradle
]));
extraPython3Packages = ps: extraPython3Packages = ps:
optionals neovimIde [ optionals neovimIde [
@ -186,126 +195,121 @@ in {
extraConfig = fileContents ./base.vim; extraConfig = fileContents ./base.vim;
extraLuaConfig = fileContents ./base.lua; extraLuaConfig = fileContents ./base.lua;
plugins = with pkgs.vimPlugins; plugins =
([ [
fzfWrapper vimPlugins.fzfWrapper
fzf-vim vimPlugins.fzf-vim
fugitive vimPlugins.fugitive
{ {
plugin = dracula-nvim.overrideAttrs { plugin = vimPlugins.dracula-nvim.overrideAttrs {
src = nvim-theme-src; src = nvim-theme-src;
}; };
type = "viml"; type = "viml";
config = fileContents ./plugins/dracula.vim; config = fileContents ./plugins/dracula.vim;
} }
{ {
plugin = todo-comments-nvim; plugin = vimPlugins.todo-comments-nvim;
type = "lua"; type = "lua";
config = config =
/* /*
lua lua
*/ */
''require('todo-comments').setup()''; ''require('todo-comments').setup()'';
} }
{ {
plugin = gitsigns-nvim; plugin = vimPlugins.gitsigns-nvim;
type = "lua"; type = "lua";
config = fileContents ./plugins/gitsigns.lua; config = fileContents ./plugins/gitsigns.lua;
} }
{ {
plugin = indent-blankline-nvim; plugin = vimPlugins.indent-blankline-nvim;
type = "lua"; type = "lua";
config = fileContents ./plugins/indent.lua; config = fileContents ./plugins/indent.lua;
} }
{ {
plugin = mini-nvim; plugin = vimPlugins.mini-nvim;
type = "lua"; type = "lua";
config = fileContents ./plugins/mini.lua; config = fileContents ./plugins/mini.lua;
} }
{ {
plugin = codewindow-nvim; plugin = vimPlugins.codewindow-nvim;
type = "lua"; type = "lua";
config = fileContents ./plugins/codewindow.lua; config = fileContents ./plugins/codewindow.lua;
} }
] ]
++ optionals neovimIde [ ++ optionals neovimIde [
markdown-preview-nvim vimPlugins.markdown-preview-nvim
# Coc configured # Coc configured
coc-clangd vimPlugins.coc-clangd
coc-cmake vimPlugins.coc-cmake
coc-css vimPlugins.coc-css
coc-eslint vimPlugins.coc-eslint
coc-java vimPlugins.coc-java
coc-sh vimPlugins.coc-sh
coc-stylelintplus-flake coc-stylelintplus-flake
{ {
plugin = coc-snippets; plugin = vimPlugins.coc-snippets;
type = "viml"; type = "viml";
config = fileContents ./plugins/snippets.vim; config = fileContents ./plugins/snippets.vim;
} }
## Lua ## Lua
coc-sumneko-lua vimPlugins.coc-sumneko-lua
neodev-nvim vimPlugins.neodev-nvim
## Fzf ## Fzf
coc-fzf vimPlugins.coc-fzf
coc-highlight vimPlugins.coc-highlight
coc-json vimPlugins.coc-json
coc-pyright vimPlugins.coc-pyright
coc-vimlsp vimPlugins.coc-vimlsp
coc-yaml vimPlugins.coc-yaml
coc-toml vimPlugins.coc-toml
coc-markdownlint vimPlugins.coc-markdownlint
coc-tsserver vimPlugins.coc-tsserver
{ {
plugin = nvim-autopairs; plugin = vimPlugins.nvim-autopairs;
type = "lua"; type = "lua";
config = fileContents ./plugins/autopairs.lua; config = fileContents ./plugins/autopairs.lua;
} }
{ {
plugin = lualine-nvim; plugin = vimPlugins.lualine-nvim;
type = "lua"; type = "lua";
config = fileContents ./plugins/lualine.lua; config = fileContents ./plugins/lualine.lua;
} }
{ {
plugin = neo-tree-nvim; plugin = vimPlugins.neo-tree-nvim;
type = "viml"; type = "viml";
config = '' config = ''
${fileContents ./plugins/neotree.vim} ${fileContents ./plugins/neotree.vim}
lua << EOF lua << EOF
${fileContents ./plugins/neotree.lua} ${fileContents ./plugins/neotree.lua}
EOF EOF
''; '';
} }
(pkgs.vimUtils.buildVimPlugin { {
name = "riscv-asm"; plugin = buildPlugin "easytables-nvim" vimplugin-easytables-src;
version = vimplugin-riscv-src.shortRev; type = "lua";
src = vimplugin-riscv-src; config =
}) /*
{ lua
plugin = pkgs.vimUtils.buildVimPlugin { */
name = "easytables-nvim"; ''require('easytables').setup();'';
version = vimplugin-easytables-src.shortRev; }
src = vimplugin-easytables-src; ]
};
type = "lua";
config = ''require("easytables").setup();'';
}
])
# Treesitter # Treesitter
++ (with pkgs.vimPlugins; [ ++ [
nvim-treesitter-context vimPlugins.nvim-treesitter-context
nvim-treesitter-textobjects vimPlugins.nvim-treesitter-textobjects
{ {
type = "viml"; type = "viml";
config = fileContents ./plugins/treesitter.vim; config = fileContents ./plugins/treesitter.vim;
plugin = nvim-treesitter.withPlugins (p: [ plugin = vimPlugins.nvim-treesitter.withPlugins (p: [
p.awk p.awk
p.bash p.bash
p.c p.c
@ -376,7 +380,7 @@ in {
p.yaml p.yaml
]); ]);
} }
]); ];
}; };
}; };
} }

17
flake.lock
View file

@ -1731,7 +1731,6 @@
"touch-gestures-src": "touch-gestures-src", "touch-gestures-src": "touch-gestures-src",
"trash-d-src": "trash-d-src", "trash-d-src": "trash-d-src",
"vimplugin-easytables-src": "vimplugin-easytables-src", "vimplugin-easytables-src": "vimplugin-easytables-src",
"vimplugin-riscv-src": "vimplugin-riscv-src",
"wpaperd": "wpaperd", "wpaperd": "wpaperd",
"xresources-theme-src": "xresources-theme-src" "xresources-theme-src": "xresources-theme-src"
} }
@ -2053,22 +2052,6 @@
"type": "github" "type": "github"
} }
}, },
"vimplugin-riscv-src": {
"flake": false,
"locked": {
"lastModified": 1713286691,
"narHash": "sha256-LGEjiJnqSUYFWGw5Elplfw4X6hQpNrkLMnaZpRzKmpg=",
"owner": "henry-hsieh",
"repo": "riscv-asm-vim",
"rev": "8f8271338a7dec472c11cceac2195dc812e21255",
"type": "github"
},
"original": {
"owner": "henry-hsieh",
"repo": "riscv-asm-vim",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {

21
flake.nix
View file

@ -331,6 +331,13 @@
owner = "nix-community"; owner = "nix-community";
repo = "nixd"; repo = "nixd";
}; };
vimplugin-easytables-src = {
type = "github";
owner = "Myzel394";
repo = "easytables.nvim";
flake = false;
};
# #
# Nix tools # Nix tools
@ -407,20 +414,6 @@
repo = "curseforge-server-downloader"; repo = "curseforge-server-downloader";
flake = false; flake = false;
}; };
vimplugin-riscv-src = {
type = "github";
owner = "henry-hsieh";
repo = "riscv-asm-vim";
flake = false;
};
vimplugin-easytables-src = {
type = "github";
owner = "Myzel394";
repo = "easytables.nvim";
flake = false;
};
## ##
## Overlays ## Overlays