chore: update custom Nix packages

This commit is contained in:
Oliver Davies 2023-11-04 09:32:37 +01:00
parent acf5767a1e
commit 9d1ca90bcc

View file

@ -1,18 +1,9 @@
{ inputs, pkgs, username, self }: { inputs, pkgs, username, self }:
let let
customVim = with self; { pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
none-ls-nvim = pkgs.vimUtils.buildVimPlugin {
name = "none-ls-nvim";
src = pkgs.fetchFromGitHub {
owner = "nvimtools";
repo = "none-ls.nvim";
rev = "main";
sha256 = "OzwC/i2bzHznf0wunclDEQ+Qfayzje19r4UBDXtbCeI=";
};
buildPhase = ":";
};
customVim = with self; {
toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin { toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin {
name = "toggle-checkbox-nvim"; name = "toggle-checkbox-nvim";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -23,16 +14,6 @@ let
}; };
}; };
vim-astro = pkgs.vimUtils.buildVimPlugin {
name = "vim-astro";
src = pkgs.fetchFromGitHub {
owner = "wuelnerdotexe";
repo = "vim-astro";
rev = "main";
sha256 = "HyQ4i/T1uQmGurBqCpo8+ESVSVPsTrLQBxLe2OEYjcY=";
};
};
vim-heritage = pkgs.vimUtils.buildVimPlugin { vim-heritage = pkgs.vimUtils.buildVimPlugin {
name = "vim-heritage"; name = "vim-heritage";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -43,16 +24,6 @@ let
}; };
}; };
vim-just = pkgs.vimUtils.buildVimPlugin {
name = "vim-just";
src = pkgs.fetchFromGitHub {
owner = "NoahTheDuke";
repo = "vim-just";
rev = "838c9096d4c5d64d1000a6442a358746324c2123";
sha256 = "DSC47z2wOEXvo2kGO5JtmR3hyHPiYXrkX7MgtagV5h4=";
};
};
vim-textobj-xmlattr = pkgs.vimUtils.buildVimPlugin { vim-textobj-xmlattr = pkgs.vimUtils.buildVimPlugin {
name = "vim-textobj-xmlattr"; name = "vim-textobj-xmlattr";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -78,21 +49,11 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "arthurxavierx"; owner = "arthurxavierx";
repo = "vim-caser"; repo = "vim-caser";
rev = "master"; rev = "6bc9f41d170711c58e0157d882a5fe8c30f34bf6";
sha256 = "PXAY01O/cHvAdWx3V/pyWFeiV5qJGvLcAKhl5DQc0Ps="; sha256 = "PXAY01O/cHvAdWx3V/pyWFeiV5qJGvLcAKhl5DQc0Ps=";
}; };
}; };
vim-visual-star-search = pkgs.vimUtils.buildVimPlugin {
name = "vim-visual-star-search";
src = pkgs.fetchFromGitHub {
owner = "nelstrom";
repo = "vim-visual-star-search";
rev = "37259722f45996733fd309add61385a4ad88bdb9";
sha256 = "n8jd6fy30XukZ9NFZX5qclSlMfziP/Ew9dXfkysRl4Y=";
};
};
vim-zoom = pkgs.vimUtils.buildVimPlugin { vim-zoom = pkgs.vimUtils.buildVimPlugin {
name = "vim-zoom"; name = "vim-zoom";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -559,13 +520,12 @@ in
plugins = with pkgs; [ plugins = with pkgs; [
customVim.tabline-vim customVim.tabline-vim
customVim.vim-astro
customVim.vim-caser customVim.vim-caser
customVim.vim-heritage customVim.vim-heritage
customVim.vim-just
customVim.vim-zoom
customVim.vim-textobj-xmlattr customVim.vim-textobj-xmlattr
customVim.vim-visual-star-search customVim.vim-zoom
pkgsUnstable.vimPlugins.vim-astro
vimPlugins.vim-visual-star-search
{ {
plugin = customVim.toggle-checkbox-nvim; plugin = customVim.toggle-checkbox-nvim;
@ -575,7 +535,7 @@ in
''; '';
} }
inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.refactoring-nvim pkgsUnstable.vimPlugins.refactoring-nvim
vimPlugins.comment-nvim vimPlugins.comment-nvim
vimPlugins.dial-nvim vimPlugins.dial-nvim
vimPlugins.gitsigns-nvim vimPlugins.gitsigns-nvim
@ -594,13 +554,22 @@ in
vimPlugins.vim-projectionist vimPlugins.vim-projectionist
vimPlugins.vim-repeat vimPlugins.vim-repeat
vimPlugins.vim-sleuth vimPlugins.vim-sleuth
vimPlugins.vim-sort-motion
vimPlugins.vim-surround vimPlugins.vim-surround
vimPlugins.vim-terraform vimPlugins.vim-terraform
vimPlugins.vim-textobj-user vimPlugins.vim-textobj-user
vimPlugins.vim-tmux-navigator vimPlugins.vim-tmux-navigator
vimPlugins.vim-unimpaired vimPlugins.vim-unimpaired
vimPlugins.lualine-nvim
vimPlugins.lualine-lsp-progress
{
plugin = vimPlugins.vim-sort-motion;
type = "lua";
config = ''
vim.g.sort_motion_flags = "ui"
'';
}
{ {
plugin = vimPlugins.treesj; plugin = vimPlugins.treesj;
type = "lua"; type = "lua";
@ -635,7 +604,7 @@ in
vimPlugins.nvim-treesitter-textobjects vimPlugins.nvim-treesitter-textobjects
# LSP # LSP
customVim.none-ls-nvim pkgsUnstable.vimPlugins.none-ls-nvim
vimPlugins.lsp-status-nvim vimPlugins.lsp-status-nvim
vimPlugins.nvim-lspconfig vimPlugins.nvim-lspconfig
@ -694,7 +663,6 @@ in
# Language servers # Language servers
ansible-language-server ansible-language-server
gopls gopls
inputs.nixpkgs-unstable.legacyPackages."${system}".nixd
lua-language-server lua-language-server
nodePackages.intelephense nodePackages.intelephense
nodePackages."@astrojs/language-server" nodePackages."@astrojs/language-server"
@ -708,6 +676,7 @@ in
nodePackages.vue-language-server nodePackages.vue-language-server
nodePackages.yaml-language-server nodePackages.yaml-language-server
phpactor phpactor
pkgsUnstable.nixd
rnix-lsp rnix-lsp
terraform-ls terraform-ls