opdavies/opdavies.nvim
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor adding Vim plugins

Browse source 
Remove the `vimPlugin.` prefix as much as possible.
This commit is contained in:
Oliver Davies 2024-09-03 23:38:54 +01:00
parent b7c347fa10
commit 472c36a437
1 changed files with 89 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

195
lib/default.nix
View file

@ -34,8 +34,6 @@ rec {
mkNeovimPlugins = mkNeovimPlugins =
{ system }: { system }:
let let
inherit (pkgs) vimPlugins;
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
inherit system; inherit system;
@ -48,55 +46,56 @@ rec {
opdavies-nvim = mkVimPlugin { inherit system; }; opdavies-nvim = mkVimPlugin { inherit system; };
in in
with pkgs.vimPlugins;
[ [
vimPlugins.tabline-vim comment-nvim
vimPlugins.vim-abolish conf-vim
vimPlugins.vim-textobj-xmlattr dial-nvim
vimPlugins.vim-zoom edit-alternate-vim
fidget-nvim
inputs.nixpkgs-2305.legacyPackages.${system}.vimPlugins.rest-nvim gitsigns-nvim
vimPlugins.comment-nvim harpoon
vimPlugins.dial-nvim impatient-nvim
vimPlugins.fidget-nvim inputs.nixpkgs-2305.legacyPackages.${system}.rest-nvim
vimPlugins.gitsigns-nvim mini-nvim
vimPlugins.harpoon neodev-nvim
vimPlugins.impatient-nvim nvim-spectre
vimPlugins.mini-nvim nvim-web-devicons
vimPlugins.neodev-nvim oil-nvim
vimPlugins.nvim-web-devicons refactoring-nvim
vimPlugins.oil-nvim standard-vim
vimPlugins.refactoring-nvim tabline-vim
vimPlugins.undotree treesj
vimPlugins.vim-eunuch undotree
vimPlugins.vim-highlightedyank vim-abolish
vimPlugins.vim-just vim-autoread
vimPlugins.vim-nix vim-eunuch
vimPlugins.nvim-spectre vim-highlightedyank
vimPlugins.vim-autoread vim-just
vimPlugins.vim-obsession vim-nix
vimPlugins.vim-pasta vim-obsession
vimPlugins.vim-repeat vim-pasta
vimPlugins.vim-sleuth vim-repeat
vimPlugins.vim-terraform vim-sleuth
vimPlugins.vim-textobj-user vim-terraform
vimPlugins.vim-tmux-navigator vim-textobj-user
vimPlugins.vim-unimpaired vim-textobj-xmlattr
vim-tmux-navigator
vimPlugins.treesj vim-unimpaired
vim-zoom
# Testing # Testing
vimPlugins.vim-test vim-test
vimPlugins.vimux
# Git # Git
vimPlugins.committia-vim committia-vim
vimPlugins.diffview-nvim diffview-nvim
vimPlugins.vim-fugitive vim-fugitive
# Debugging # Debugging
vimPlugins.nvim-dap nvim-dap
vimPlugins.nvim-dap-ui nvim-dap-ui
vimPlugins.nvim-dap-virtual-text nvim-dap-virtual-text
# Treesitter # Treesitter
(pkgs.vimPlugins.nvim-treesitter.withPlugins ( (pkgs.vimPlugins.nvim-treesitter.withPlugins (
@ -136,61 +135,46 @@ rec {
yaml yaml
] ]
)) ))
vimPlugins.nvim-treesitter-context nvim-treesitter-context
vimPlugins.nvim-treesitter-textobjects nvim-treesitter-textobjects
# LSP, linting and formatting # LSP, linting and formatting
vimPlugins.conform-nvim conform-nvim
vimPlugins.lsp-status-nvim lsp-status-nvim
vimPlugins.nvim-lint nvim-lint
vimPlugins.nvim-lspconfig nvim-lspconfig
# Completion # Completion
cmp-buffer
cmp-cmdline
cmp-nvim-lsp
cmp-path
cmp-treesitter
cmp_luasnip
lspkind-nvim
nvim-cmp
pkgs2305.vimPlugins.phpactor pkgs2305.vimPlugins.phpactor
vimPlugins.cmp-buffer
vimPlugins.cmp-cmdline
vimPlugins.cmp-nvim-lsp
vimPlugins.cmp-path
vimPlugins.cmp-treesitter
vimPlugins.cmp_luasnip
vimPlugins.lspkind-nvim
vimPlugins.nvim-cmp
# Snippets # Snippets
vimPlugins.friendly-snippets friendly-snippets
vimPlugins.luasnip luasnip
# Telescope # Telescope
vimPlugins.plenary-nvim plenary-nvim
vimPlugins.popup-nvim popup-nvim
vimPlugins.telescope-frecency-nvim telescope-frecency-nvim
vimPlugins.telescope-fzf-native-nvim telescope-fzf-native-nvim
vimPlugins.telescope-live-grep-args-nvim telescope-live-grep-args-nvim
vimPlugins.telescope-nvim telescope-nvim
vimPlugins.telescope-ui-select-nvim telescope-ui-select-nvim
# Databases # Databases
vimPlugins.vim-dadbod vim-dadbod
vimPlugins.vim-dadbod-ui vim-dadbod-ui
vimPlugins.vim-dadbod-completion vim-dadbod-completion
vimPlugins.markdown-preview-nvim
# # Markdown
# {
# plugin = vimPlugins.markdown-preview-nvim;
# type = "lua";
# config = ''
# vim.g.mkdp_refresh_slow = 1
# '';
# }
# Themes # Themes
vimPlugins.catppuccin-nvim catppuccin-nvim
vimPlugins.conf-vim
vimPlugins.edit-alternate-vim
vimPlugins.standard-vim
# Configuration. # Configuration.
opdavies-nvim opdavies-nvim
@ -206,18 +190,20 @@ rec {
config.allowUnfree = true; config.allowUnfree = true;
}; };
inherit (pkgs) hadolint;
in in
with pkgs;
[ [
# Languages # Languages
nodePackages.typescript nodePackages.typescript
pkgs.nodejs-slim nodejs-slim
pkgs.php81 php81
# Language servers # Language servers
gopls
lua-language-server
lua54Packages.luacheck lua54Packages.luacheck
pkgs.marksman marksman
nil
nodePackages."@tailwindcss/language-server" nodePackages."@tailwindcss/language-server"
nodePackages.bash-language-server nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs nodePackages.dockerfile-language-server-nodejs
@ -228,30 +214,27 @@ rec {
nodePackages.vscode-langservers-extracted nodePackages.vscode-langservers-extracted
nodePackages.vue-language-server nodePackages.vue-language-server
nodePackages.yaml-language-server nodePackages.yaml-language-server
pkgs.gopls phpactor
pkgs.lua-language-server terraform-ls
pkgs.nil
pkgs.phpactor
pkgs.terraform-ls
# Formatters # Formatters
pkgs.black black
pkgs.eslint_d eslint_d
pkgs.nixfmt-rfc-style nixfmt-rfc-style
pkgs.nodePackages.prettier nodePackages.prettier
pkgs.stylua stylua
pkgs.yamlfmt yamlfmt
# Tools # Tools
hadolint hadolint
html-tidy
nodePackages.jsonlint nodePackages.jsonlint
nodePackages.markdownlint-cli nodePackages.markdownlint-cli
php82Packages.php-codesniffer php82Packages.php-codesniffer
php82Packages.phpstan php82Packages.phpstan
pkgs.html-tidy proselint
pkgs.proselint shellcheck
pkgs.shellcheck yamllint
pkgs.yamllint
]; ];
mkExtraConfig = '' mkExtraConfig = ''