daniel/dotfiles
1
0
Fork 0
Code Activity Actions

nvim: Update and reorganize some plugins

Browse source
This commit is contained in:
Daniel Kempkens 2022-03-02 23:31:21 +01:00
parent f6500e675c
commit 440a8773ca
14 changed files with 228 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/nvim/lua/nifoc/config/colorizer.lua
View file

@ -1,7 +0,0 @@
require('colorizer').setup {
'css';
'html';
'lua';
'svelte';
'vim'
}

2
config/nvim/lua/nifoc/config/cursorline.lua
View file

@ -1,5 +1,5 @@
vim.cmd('augroup nifoc_cusorline') vim.cmd('augroup nifoc_cusorline')
vim.cmd('autocmd!') vim.cmd('autocmd!')
vim.cmd('autocmd FileType TelescopePrompt setlocal nocursorline') vim.cmd('autocmd FileType TelescopePrompt setlocal nocursorline')
vim.cmd('autocmd FileType NvimTree let b:auto_cursorline_disabled = 1') vim.cmd('autocmd FileType NvimTree setlocal nocursorline')
vim.cmd('augroup end') vim.cmd('augroup end')

13
config/nvim/lua/nifoc/config/fterm.lua
View file

@ -5,16 +5,3 @@ fterm.setup {
border = { '╭', '─', '╮', '│', '╯', '─', '╰', '│' }, border = { '╭', '─', '╮', '│', '╯', '─', '╰', '│' },
} }
local lazygit = fterm:new({
cmd = 'lazygit',
dimensions = {
height = 0.9,
width = 0.9
},
})
function _G.__fterm_lazygit()
lazygit:toggle()
end

37
config/nvim/lua/nifoc/config/lsp.lua
View file

@ -1,6 +1,5 @@
local lsp = require('lspconfig') local lsp = require('lspconfig')
local lsp_status = require('lsp-status') local lsp_status = require('lsp-status')
local illuminate = require('illuminate')
local diagnostic_utils = require('nifoc.utils.diagnostic') local diagnostic_utils = require('nifoc.utils.diagnostic')
local function custom_attach(client, bufnr) local function custom_attach(client, bufnr)
@ -8,7 +7,11 @@ local function custom_attach(client, bufnr)
lsp_status.on_attach(client) lsp_status.on_attach(client)
if client.resolved_capabilities.document_highlight then if client.resolved_capabilities.document_highlight then
illuminate.on_attach(client) require('illuminate').on_attach(client)
end
if client.resolved_capabilities.code_lens then
require('virtualtypes').on_attach(client, bufnr)
end end
diagnostic_utils.maybe_enable_lsp(client, bufnr) diagnostic_utils.maybe_enable_lsp(client, bufnr)
@ -118,3 +121,33 @@ lsp.sumneko_lua.setup(vim.tbl_extend('force', default_config, {
}, },
}, },
})) }))
-- Custom handlers
vim.lsp.handlers['window/showMessage'] = function(_, result, ctx, _)
local client_id = ctx.client_id
local client = vim.lsp.get_client_by_id(client_id)
local client_name = client and client.name or string.format("id=%d", client_id)
if not client then
local error_msg = "LSP client has shut down after sending the message"
vim.notify(error_msg, "error", {
title = 'LSP | ' .. client_name,
timeout = 10000,
})
else
local message_type = result.type
local message_type_name = ({
'ERROR',
'WARN',
'INFO',
'DEBUG',
})[message_type]
local message = result.message
vim.notify(message, message_type_name, {
title = 'LSP | ' .. client_name,
timeout = 10000,
})
end
end

8
config/nvim/lua/nifoc/config/neogit.lua Normal file
View file

@ -0,0 +1,8 @@
require('neogit').setup({
signs = {
-- { CLOSED, OPENED }
section = { "", "" },
item = { "", "" },
hunk = { "", "" },
},
})

65
config/nvim/lua/nifoc/keymap.lua
View file

@ -1,19 +1,15 @@
local wk = require('which-key') local wk = require('which-key')
local npairs = require('nvim-autopairs') local npairs = require('nvim-autopairs')
local telescope = require('telescope') local telescope = require('telescope')
local telescope_builtin = require('telescope.builtin') local telescope_builtin = require('telescope.builtin')
local telescope_themes = require('telescope.themes') local telescope_themes = require('telescope.themes')
-- Global key function
_G.nifoc_keymap_cr_complete = function()
return npairs.autopairs_cr()
end
local M = {} local M = {}
function M.setup() function M.setup()
vim.api.nvim_set_keymap('n', '<space>', '<nop>', {noremap = true}) vim.keymap.set('n', '<space>', '<nop>', {noremap = true})
vim.g.mapleader = ' ' vim.g.mapleader = ' '
vim.opt.timeoutlen = 500 vim.opt.timeoutlen = 500
@ -86,9 +82,21 @@ function M.setup()
function() require('gitsigns').blame_line() end, function() require('gitsigns').blame_line() end,
"Blame Line" "Blame Line"
}, },
n = {
"<cmd>Neogit<CR>",
"Neogit"
},
c = { c = {
function() _G.__fterm_lazygit() end, "<cmd>Neogit commit<CR>",
"lazygit" "Commit"
},
p = {
"<cmd>Neogit pull<CR>",
"Pull"
},
P = {
"<cmd>Neogit push<CR>",
"Push"
}, },
}, },
d = { d = {
@ -99,6 +107,10 @@ function M.setup()
"<cmd>LspInfo<CR>", "<cmd>LspInfo<CR>",
"Info" "Info"
}, },
n = {
"<cmd>NullLsInfo<CR>",
"null-ls Info"
},
r = { r = {
"<cmd>LspRestart<CR>", "<cmd>LspRestart<CR>",
"Restart" "Restart"
@ -119,28 +131,27 @@ function M.setup()
wk.register(leader, {prefix = "<leader>", noremap = false, silent = true}) wk.register(leader, {prefix = "<leader>", noremap = false, silent = true})
-- Other mappings -- Other mappings
vim.api.nvim_set_keymap('n', '<CR>', ':nohlsearch<CR><CR>', {noremap = true, silent = true}) vim.keymap.set('n', '<CR>', ':nohlsearch<CR><CR>', {noremap = true, silent = true})
vim.keymap.set('i', '<CR>', npairs.autopairs_cr, {noremap = true, expr = true, silent = true})
vim.api.nvim_set_keymap('i', '<CR>', 'v:lua.nifoc_keymap_cr_complete()', {noremap = true, expr = true, silent = true}) vim.keymap.set('n', '<A-Left>', 'b', {noremap = true})
vim.keymap.set('n', '<A-Right>', 'w', {noremap = true})
vim.api.nvim_set_keymap('n', '<A-Left>', 'b', {noremap = true}) vim.keymap.set('n', '<S-Left>', '^', {noremap = true})
vim.api.nvim_set_keymap('n', '<A-Right>', 'w', {noremap = true}) vim.keymap.set('n', '<S-Right>', '$', {noremap = true})
vim.api.nvim_set_keymap('n', '<S-Left>', '^', {noremap = true}) vim.keymap.set('i', '<A-Left>', '<C-o>b', {noremap = true})
vim.api.nvim_set_keymap('n', '<S-Right>', '$', {noremap = true}) vim.keymap.set('i', '<A-Right>', '<C-o>w', {noremap = true})
vim.api.nvim_set_keymap('i', '<A-Left>', '<C-o>b', {noremap = true}) vim.keymap.set('i', '<S-Left>', '<C-o>^', {noremap = true})
vim.api.nvim_set_keymap('i', '<A-Right>', '<C-o>w', {noremap = true}) vim.keymap.set('i', '<S-Right>', '<C-o>$', {noremap = true})
vim.api.nvim_set_keymap('i', '<S-Left>', '<C-o>^', {noremap = true})
vim.api.nvim_set_keymap('i', '<S-Right>', '<C-o>$', {noremap = true})
-- vim-yoink -- vim-yoink
vim.api.nvim_set_keymap('n', 'p', '<Plug>(YoinkPaste_p)', {noremap = false}) vim.keymap.set('n', 'p', '<Plug>(YoinkPaste_p)')
vim.api.nvim_set_keymap('n', 'P', '<Plug>(YoinkPaste_P)', {noremap = false}) vim.keymap.set('n', 'P', '<Plug>(YoinkPaste_P)')
vim.api.nvim_set_keymap('x', 'p', '<Plug>(SubversiveSubstitute)', {noremap = false}) vim.keymap.set('x', 'p', '<Plug>(SubversiveSubstitute)')
vim.api.nvim_set_keymap('x', 'P', '<Plug>(SubversiveSubstitute)', {noremap = false}) vim.keymap.set('x', 'P', '<Plug>(SubversiveSubstitute)')
vim.api.nvim_set_keymap('n', 'gp', '<Plug>(YoinkPaste_gp)', {noremap = false}) vim.keymap.set('n', 'gp', '<Plug>(YoinkPaste_gp)')
vim.api.nvim_set_keymap('n', 'gP', '<Plug>(YoinkPaste_gP)', {noremap = false}) vim.keymap.set('n', 'gP', '<Plug>(YoinkPaste_gP)')
vim.api.nvim_set_keymap('n', 'y', '<Plug>(YoinkYankPreserveCursorPosition)', {noremap = false}) vim.keymap.set('n', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
vim.api.nvim_set_keymap('x', 'y', '<Plug>(YoinkYankPreserveCursorPosition)', {noremap = false}) vim.keymap.set('x', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
vim.api.nvim_set_keymap('n', '<C-t>', '<cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true}) vim.api.nvim_set_keymap('n', '<C-t>', '<cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true})
vim.api.nvim_set_keymap('t', '<C-t>', '<C-\\><C-n><cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true}) vim.api.nvim_set_keymap('t', '<C-t>', '<C-\\><C-n><cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true})

2
config/nvim/lua/nifoc/plugins.lua
View file

@ -64,7 +64,7 @@ require('nifoc.config.bufferline')
require('nifoc.config.nvim_tree') require('nifoc.config.nvim_tree')
require('nifoc.config.indent_line') require('nifoc.config.indent_line')
require('nifoc.config.virt_column') require('nifoc.config.virt_column')
require('nifoc.config.colorizer') require('nifoc.config.neogit')
require('nifoc.config.gitsigns') require('nifoc.config.gitsigns')
require('spellsitter').setup() require('spellsitter').setup()
vim.notify = require('notify') vim.notify = require('notify')

36
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1642495030, "lastModified": 1645293039,
"narHash": "sha256-u1ZlFbLWzkM6zOfuZ1tr0tzTuDWucOYwALPWDWLorkE=", "narHash": "sha256-PwdDu+SkX8dreeuJ/4av1sEluNZdrpdXv8JsRKKg1Yc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bcdb6022b3a300abf59cb5d0106c158940f5120e", "rev": "1df878b6f8351795a3bebfbe4fd2d02e1e8b29d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1644706973, "lastModified": 1645970334,
"narHash": "sha256-xOyxrhc5V79u0ZNmnPmJbY3ngtp43dNISEmrb8Ie6wQ=", "narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7c2ae0bdd20ddcaafe41ef669226a1df67f8aa06", "rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -96,11 +96,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1644888357, "lastModified": 1646204719,
"narHash": "sha256-a7Q3SpJKE7p5S3+WxdSOm937r3CLB5GIFyf6F4jsbBc=", "narHash": "sha256-qD7dl57gpQ14KUWv1MIGBfLrH1eXRJqi1cICh/B2laE=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "1bd6c0a05c18e10e9439b4090e6f57f0d1e1fc21", "rev": "4b3f920477e9838c3f3a9cd67a47d1494b9cc229",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -119,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1644912823, "lastModified": 1646208901,
"narHash": "sha256-LBc1wrLSZ3AZd0I6CHQsf45TwFhS9a/K10DLUnfetMw=", "narHash": "sha256-tGk12hIfSSzjsH3EhIa9fJxMpVYWBqGXWu+JPmmb9PU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "3767067ca17bcac639aa3b3deea3a8af7a6de0e8", "rev": "66c878478683e72bdd346984cbcabe0c4eccee81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1644486793, "lastModified": 1646121518,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", "narHash": "sha256-CgsJPJImnCOvUyTUHoCNaSJk/7Ozv2T1aPwS++O3gkI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "rev": "684c73c9e6ac8f4d0c6dea3251292e758ac375b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1644884990, "lastModified": 1646181315,
"narHash": "sha256-1utNBXnaL412GNQnVAb68+kO2z1vQxlCeasyL4S/IIs=", "narHash": "sha256-FMjMB5fF3ln5ccSypaJdzWHrOWzubRXcYoaB8f6VhsE=",
"owner": "arqv", "owner": "arqv",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "e92319df40fdb1e963bc1991d08514fa8477053c", "rev": "e4e0e1c3be80340b0f644f4ff18f63e1f9b0e478",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -30,12 +30,14 @@
outputs = inputs@{ self, nixpkgs, darwin, home-manager, ... }: outputs = inputs@{ self, nixpkgs, darwin, home-manager, ... }:
let let
overlay-x86 = final: prev: { pkgs-x86 = import inputs.nixpkgs { system = "x86_64-darwin"; }; };
overlay-neovim = inputs.neovim-nightly-overlay.overlay; overlay-neovim = inputs.neovim-nightly-overlay.overlay;
overlay-zig = final: prev: { zigpkgs = inputs.zig-overlay.packages.${prev.system}; }; overlay-zig = final: prev: { zigpkgs = inputs.zig-overlay.packages.${prev.system}; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-x86
overlay-neovim overlay-neovim
overlay-zig overlay-zig
overlay-nifoc overlay-nifoc

14
programs/lazygit.nix
View file

@ -1,14 +0,0 @@
{
programs.lazygit = {
enable = true;
settings = {
git = {
paging = {
colorArg = "always";
useConfig = true;
};
};
};
};
}

4
programs/nvim/default.nix
View file

@ -65,7 +65,6 @@ in
# Fixes # Fixes
impatient-nvim impatient-nvim
FixCursorHold-nvim FixCursorHold-nvim
vim-auto-cursorline
# Utils # Utils
popup-nvim popup-nvim
@ -98,6 +97,7 @@ in
null-ls-nvim null-ls-nvim
trouble-nvim trouble-nvim
lspkind-nvim lspkind-nvim
virtual-types-nvim
lsp-status-nvim lsp-status-nvim
vim-illuminate vim-illuminate
@ -133,7 +133,7 @@ in
nvim-tree-lua nvim-tree-lua
indent-blankline-nvim indent-blankline-nvim
virt-column-nvim virt-column-nvim
nvim-colorizer-lua neogit
gitsigns-nvim gitsigns-nvim
spellsitter-nvim spellsitter-nvim
nvim-notify nvim-notify

202
programs/nvim/plugins.nix
View file

@ -3,40 +3,28 @@
{ {
impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "impatient.nvim"; pname = "impatient.nvim";
version = "1644529241"; version = "1645465106";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "impatient.nvim"; repo = "impatient.nvim";
rev = "c602af04b487643b4b3f7f9aa9b4aea38a596b94"; rev = "7abfc924714d3b7f19f3674cca0231cf6ef2050f";
sha256 = "AXwTzxeHdglU7Kc3nRdYfDLJIwFEEm0FcXhb1uhj0tM="; sha256 = "f+08N88A5XkUR28HXYEc537iSUHAqdVQFSpSGb1GABM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/lewis6991/impatient.nvim"; meta.homepage = "https://github.com/lewis6991/impatient.nvim";
}; };
FixCursorHold-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { FixCursorHold-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "FixCursorHold.nvim"; pname = "FixCursorHold.nvim";
version = "1635853855"; version = "1645084379";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "antoinemadec"; owner = "antoinemadec";
repo = "FixCursorHold.nvim"; repo = "FixCursorHold.nvim";
rev = "0e4e22d21975da60b0fd2d302285b3b603f9f71e"; rev = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1";
sha256 = "v56qtPGa8MkEPpQpzA+XHH/TsV1q4p65wSuvF140LuM="; sha256 = "OFQkcciHQa4Mp3BieBY5EqMsTqT40e1S41+oa6ZzMSw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim"; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim";
}; };
vim-auto-cursorline = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-auto-cursorline";
version = "1584263271";
src = pkgs.fetchFromGitHub {
owner = "delphinus";
repo = "vim-auto-cursorline";
rev = "ee22b1589809f1b1aaaaef15997a0a84585d667f";
sha256 = "+ajtZm9pJrl49fI7zFqBJ49SL1XqfOoTp0ICelEknYc=";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/delphinus/vim-auto-cursorline";
};
popup-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { popup-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "popup.nvim"; pname = "popup.nvim";
version = "1637254091"; version = "1637254091";
@ -51,24 +39,24 @@
}; };
plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "plenary.nvim"; pname = "plenary.nvim";
version = "1644502349"; version = "1646238606";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-lua"; owner = "nvim-lua";
repo = "plenary.nvim"; repo = "plenary.nvim";
rev = "66472128c3191b786966798fc956a689705ab1be"; rev = "d742fd9c4a311ea9351eebef4c91e50d5960dd1e";
sha256 = "Iyp2tka563YJjygBiE5g6RDiZWC0Y58w990QAvZVo3A="; sha256 = "+0fc3eVwWeHKJJYLCcCMAwFQIjJjEJSRA1e0U8mrnEs=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/nvim-lua/plenary.nvim"; meta.homepage = "https://github.com/nvim-lua/plenary.nvim";
}; };
nvim-web-devicons = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-web-devicons = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-web-devicons"; pname = "nvim-web-devicons";
version = "1644145343"; version = "1645288522";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "kyazdani42"; owner = "kyazdani42";
repo = "nvim-web-devicons"; repo = "nvim-web-devicons";
rev = "e3294f687626b40754bb40ac2d636d166098b2fb"; rev = "4415d1aaa56f73b9c05795af84d625c610b05d3b";
sha256 = "pBZ2HrgtNeQ5dF/dZ/DKRRiboplRr5fvSo74ebubUtE="; sha256 = "0nuv0kBPGV9F6Nmt5GERUG9E8kkXFrbS+cJ1CVQAQ9g=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons"; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons";
@ -123,12 +111,12 @@
}; };
lightspeed-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { lightspeed-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "lightspeed.nvim"; pname = "lightspeed.nvim";
version = "1644912487"; version = "1646047482";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ggandor"; owner = "ggandor";
repo = "lightspeed.nvim"; repo = "lightspeed.nvim";
rev = "46448b46a1e3de272d9c1b532535d68db6a018d5"; rev = "23565bcdd45afea0c899c71a367b14fc121dbe13";
sha256 = "58QBr27NoNt8QaZRbbX3ZbV3267RsquiOEOywacpJ68="; sha256 = "005p+Ytc7Tdmwcni2Z5AibkAKY/dCgH8eEtDY0QDG4Q=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/ggandor/lightspeed.nvim"; meta.homepage = "https://github.com/ggandor/lightspeed.nvim";
@ -147,24 +135,24 @@
}; };
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "1644949416"; version = "1646255537";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "32eb1678756f8c396061ee72611fd18a8d309eff"; rev = "5b6f6ae30c1cf8fceefe08a9bcf799870558a878";
sha256 = "jf4TQd4emvooKeBwJZqwJWzUlgEHS0BsXvUe/eBkXAQ="; sha256 = "AYHc/sRJM4jW0+CMbWYX78368cgzYrLWAwtb8pDuNsE=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter";
}; };
playground = pkgs.vimUtils.buildVimPluginFrom2Nix { playground = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "playground"; pname = "playground";
version = "1631739633"; version = "1645025876";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "playground"; repo = "playground";
rev = "787a7a8d4444e58467d6b3d4b88a497e7d494643"; rev = "9df82a27a49e1c14e9d7416b537517a79d675086";
sha256 = "YMINv064VzuzZLuQNY6HN3oCZvYjNQi6IMliQPTijfg="; sha256 = "Qfzpey5WOZdVOySDzAhf5Rt7Tkam6pdsx3t49rJmGcI=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/nvim-treesitter/playground"; meta.homepage = "https://github.com/nvim-treesitter/playground";
@ -183,24 +171,24 @@
}; };
telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "telescope.nvim"; pname = "telescope.nvim";
version = "1644911516"; version = "1645627005";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "df0b35c8bc0944164828ccba8ea17941423c6725"; rev = "567ec85b157f1606b500a0f755181f284810a28e";
sha256 = "aTNioZAu8zfPsiTLxn2JrBkpmgGuJZQ88oRG6w8o3Wc="; sha256 = "VnALUaFRiVf+sKgAFNcyKuIChYJd8PwG8OOl90Ww7d8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim";
}; };
telescope-zf-native-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { telescope-zf-native-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "telescope-zf-native.nvim"; pname = "telescope-zf-native.nvim";
version = "1644858089"; version = "1644962465";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "natecraddock"; owner = "natecraddock";
repo = "telescope-zf-native.nvim"; repo = "telescope-zf-native.nvim";
rev = "99a5ad90046274774520b7cf62124826737ca0a1"; rev = "dabcdff0b26d0313f8a9add1e29193d5c030c7b5";
sha256 = "ud0VW10PTyQXh4nE/0lzvltioN09k5vErt33qhK6WUY="; sha256 = "+Ku+MEczj+KSLb0rcqKhAQAMdm+PeiFMLrVp1lIIpDI=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = with pkgs; [ just zigpkgs."0.9.0" ]; nativeBuildInputs = with pkgs; [ just zigpkgs."0.9.0" ];
@ -238,24 +226,24 @@
}; };
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "1644780846"; version = "1646161201";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "0da0023374a2acbab25e538383006f1404bf3c0d"; rev = "cdc2ec53e028d32f06c51ef8b2837ebb8460ef45";
sha256 = "2gtGMZuMThQs5Uv+QuC03qW7AT88YL6XaVxxxuZzRos="; sha256 = "VVU1n8dROoI95pYsh4RUh3EBR/VZoXZc4GcGQ2pNcu0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/neovim/nvim-lspconfig"; meta.homepage = "https://github.com/neovim/nvim-lspconfig";
}; };
null-ls-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { null-ls-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "null-ls.nvim"; pname = "null-ls.nvim";
version = "1644939752"; version = "1646144986";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "jose-elias-alvarez"; owner = "jose-elias-alvarez";
repo = "null-ls.nvim"; repo = "null-ls.nvim";
rev = "97de1c898aaf2bab89134a452305ff27b3bae4b3"; rev = "a1804de23ce354c982aa08c57d3ed89aad8a15a9";
sha256 = "HydBzjPzmYlEqvA+rSKAgDZLzDY/fffLCdHXE6+mico="; sha256 = "5mNKC9OQZNwml0c4+gBpzq8d8VYgCb+W9vsrWUmO66c=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim"; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim";
@ -284,6 +272,18 @@
}; };
meta.homepage = "https://github.com/onsails/lspkind-nvim"; meta.homepage = "https://github.com/onsails/lspkind-nvim";
}; };
virtual-types-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "virtual-types.nvim";
version = "1644848008";
src = pkgs.fetchFromGitHub {
owner = "jubnzv";
repo = "virtual-types.nvim";
rev = "094fcf2ad2c434d4b5d1f2dcad45c233e5f6f0c4";
sha256 = "2zVEBpJToEryN89ZU4nxpMwO0J/Ug2gshJLSGh5XOC8=";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/jubnzv/virtual-types.nvim";
};
lsp-status-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { lsp-status-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "lsp-status.nvim"; pname = "lsp-status.nvim";
version = "1638992828"; version = "1638992828";
@ -310,12 +310,12 @@
}; };
nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-cmp"; pname = "nvim-cmp";
version = "1644924861"; version = "1646190781";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "nvim-cmp"; repo = "nvim-cmp";
rev = "13d64460cba64950aff41e230cc801225bd9a3e2"; rev = "1001683bee3a52a7b7e07ba9d391472961739c7b";
sha256 = "ywxeL1l1BuKn+DSz+NJYImdZJBaRWb3iuNLqHdfLKiQ="; sha256 = "uJ/Fex32smh47R21ozAUDj+4YmE1djhz7PPm/yrwTfw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/hrsh7th/nvim-cmp"; meta.homepage = "https://github.com/hrsh7th/nvim-cmp";
@ -346,12 +346,12 @@
}; };
LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix { LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "LuaSnip"; pname = "LuaSnip";
version = "1644759090"; version = "1645909536";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "L3MON4D3"; owner = "L3MON4D3";
repo = "LuaSnip"; repo = "LuaSnip";
rev = "c1d07078dce0c9631e89a299e4b4a93334650a7b"; rev = "7c634ddf7ff99245ef993b5fa459c3b61e905075";
sha256 = "jxYeMQw3H3tbF7Wa+GxVzAMHDnZgZiausNuYdCMiDXo="; sha256 = "W45XfZ6QWnp0l2oa54KlhGfHGrYL5uXIWpMqmw7VeGg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/L3MON4D3/LuaSnip"; meta.homepage = "https://github.com/L3MON4D3/LuaSnip";
@ -394,12 +394,12 @@
}; };
cmp-buffer = pkgs.vimUtils.buildVimPluginFrom2Nix { cmp-buffer = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "cmp-buffer"; pname = "cmp-buffer";
version = "1641254550"; version = "1645413199";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "cmp-buffer"; repo = "cmp-buffer";
rev = "f83773e2f433a923997c5faad7ea689ec24d1785"; rev = "d66c4c2d376e5be99db68d2362cd94d250987525";
sha256 = "LXNckOkSqRMFWJhBaPUm8el0SgTS2XPvg3N8CEwHLHw="; sha256 = "itDEtoRvZn1mtLhT9WtqKVXoMRe5Qw0/QUf+TFzGNVk=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/hrsh7th/cmp-buffer"; meta.homepage = "https://github.com/hrsh7th/cmp-buffer";
@ -442,48 +442,48 @@
}; };
nvim-autopairs = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-autopairs = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-autopairs"; pname = "nvim-autopairs";
version = "1644824771"; version = "1646193452";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "windwp"; owner = "windwp";
repo = "nvim-autopairs"; repo = "nvim-autopairs";
rev = "784398a8f184431fd4329f20b0e4f52e87707bbd"; rev = "771fda8d169384d345c8bbf2f871b75ba4a2dee5";
sha256 = "iPYA4lWBMnTnZfe9rXyd6V2glXB3zDqnEij6WbAKjZE="; sha256 = "fLphqZ6vZ3iodwXEbOMW9vQoIPB0i1ff48erYPKuksQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/windwp/nvim-autopairs"; meta.homepage = "https://github.com/windwp/nvim-autopairs";
}; };
nvim-ts-autotag = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-ts-autotag = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-ts-autotag"; pname = "nvim-ts-autotag";
version = "1644373591"; version = "1646129907";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "windwp"; owner = "windwp";
repo = "nvim-ts-autotag"; repo = "nvim-ts-autotag";
rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715"; rev = "887fcd9e45ff112c4f39d2a8ba2594d04b99752a";
sha256 = "tVCDJ1oFoNzMkcaR9kT4a+xGTpphCVcOpwI/Uycm3X8="; sha256 = "35CKLPWxtPDun94uBVpfg7Xume6a5MtY3i3yhJqb2wQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/windwp/nvim-ts-autotag"; meta.homepage = "https://github.com/windwp/nvim-ts-autotag";
}; };
Comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { Comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "Comment.nvim"; pname = "Comment.nvim";
version = "1644815244"; version = "1645002769";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "numToStr"; owner = "numToStr";
repo = "Comment.nvim"; repo = "Comment.nvim";
rev = "1738ae5f67d1a76ce487edba5f3d79b8e80dd03b"; rev = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598";
sha256 = "/nfvcqIpvTQ8DuM5XJKua1XEM3QZp9s3ki3mlNGSkoQ="; sha256 = "uH4Z3GFFMF6mHO0TC0lo4OnhIehUzcWOlwPpGQNT2wM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/numToStr/Comment.nvim"; meta.homepage = "https://github.com/numToStr/Comment.nvim";
}; };
nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-treesitter-textobjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "1644272468"; version = "1646181875";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects"; repo = "nvim-treesitter-textobjects";
rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7"; rev = "7c6b5fe0926f52854f193d058cd98d2e74c3d483";
sha256 = "hxf2OMgEOg1PRpAdYuMCOe0opkzX/o6yho+MEU5XQQg="; sha256 = "FF+3qWzdHSYC9SlNG8JOt+pmht39pSiJMcYuXL+KL/8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects";
@ -502,60 +502,60 @@
}; };
vim-matchup = pkgs.vimUtils.buildVimPluginFrom2Nix { vim-matchup = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-matchup"; pname = "vim-matchup";
version = "1644785793"; version = "1645154316";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "andymass"; owner = "andymass";
repo = "vim-matchup"; repo = "vim-matchup";
rev = "71739b54228eaa79344b02d46a61d88c2be1b234"; rev = "7fd8806138f404498db7a3e848d8fa55ad61e7cf";
sha256 = "9lfz8E2NjdEgE84xC4PH/tRvdzEAPTtNEiGziCd88Sc="; sha256 = "94MxL1tajiKfgA8gpu2cO3jQmRj64Kg80efzlgHfMhg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/andymass/vim-matchup"; meta.homepage = "https://github.com/andymass/vim-matchup";
}; };
undotree = pkgs.vimUtils.buildVimPluginFrom2Nix { undotree = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "undotree"; pname = "undotree";
version = "1643910486"; version = "1645039348";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mbbill"; owner = "mbbill";
repo = "undotree"; repo = "undotree";
rev = "8a01863a8204b2382ec341d0203c4e9665212221"; rev = "08e259be24d4476c1ee745dc735eefd44f90efdc";
sha256 = "43Yco/5Q2t8lVRQbgeXLpygXga0cKmLfdjvCPCsPDGo="; sha256 = "vsbJxVIAxwPssVC3wGNQmoUw8XNw4itkQx1SoDMvk5Q=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/mbbill/undotree"; meta.homepage = "https://github.com/mbbill/undotree";
}; };
lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "lualine.nvim"; pname = "lualine.nvim";
version = "1644945425"; version = "1646229778";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-lualine"; owner = "nvim-lualine";
repo = "lualine.nvim"; repo = "lualine.nvim";
rev = "40849728b6c9b3389c7b54739f426f9899b53778"; rev = "32c85cd214c387fd4883ccb18257e0204184fb85";
sha256 = "zU3YggJ29Qb+sLOhpnk08vu+vMSuyC2yHdtLETV3j5M="; sha256 = "tfg7brrB8uLt+wnytlUinRm48beycI8jelF2UvxM/EM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim"; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim";
}; };
bufferline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { bufferline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "bufferline.nvim"; pname = "bufferline.nvim";
version = "1644934336"; version = "1645739918";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "akinsho"; owner = "akinsho";
repo = "bufferline.nvim"; repo = "bufferline.nvim";
rev = "e97a404bd7449ecebab243c796c1016c98397fc0"; rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537";
sha256 = "VFtYHQ3Yv4KJYcxvn4tv6zUTjGy+AnzvD0e8uPti2LE="; sha256 = "NDR5O0+Gxsml9XF6g4pPFlTwYay/1eHEmCaaQM0bgfc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/akinsho/bufferline.nvim"; meta.homepage = "https://github.com/akinsho/bufferline.nvim";
}; };
nvim-tree-lua = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-tree-lua = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-tree.lua"; pname = "nvim-tree.lua";
version = "1644954746"; version = "1646253725";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "kyazdani42"; owner = "kyazdani42";
repo = "nvim-tree.lua"; repo = "nvim-tree.lua";
rev = "0c43c809b97bb95ba994d909f769cf8df2230ad9"; rev = "866442fd2c314ea020a670f4224e2038d46bbd4c";
sha256 = "NyyuWt/hmavtcx2qnAJ/6AbjkIEvDrXJ0Gd02Ogqx0o="; sha256 = "PSFkJF/cWMWptZ37zl6/gl19sG462loax60zS/PyVEU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua"; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua";
@ -574,60 +574,60 @@
}; };
virt-column-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { virt-column-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "virt-column.nvim"; pname = "virt-column.nvim";
version = "1644284743"; version = "1645684789";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lukas-reineke"; owner = "lukas-reineke";
repo = "virt-column.nvim"; repo = "virt-column.nvim";
rev = "8b7dd58fa913941537553ad6451071d00f959d10"; rev = "29db24c5e94243df1f34f47bbcb4e7803204cae4";
sha256 = "ZSgRDvWKDbthCfJ9bhavWifmhTnnXsk8ZXaVCtPrZSU="; sha256 = "alIOA1ggGzsefcTfA0cGALaHvndoZXBbBAWkK1u7YRc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim"; meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim";
}; };
nvim-colorizer-lua = pkgs.vimUtils.buildVimPluginFrom2Nix { neogit = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-colorizer.lua"; pname = "neogit";
version = "1591879145"; version = "1645786671";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "norcalli"; owner = "TimUntersberger";
repo = "nvim-colorizer.lua"; repo = "neogit";
rev = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6"; rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0";
sha256 = "6YrnItxExL2C8pNIdLd+hXCjsB2MbZANwWkah6dreD8="; sha256 = "Jc0b8PeEzB/3AZ+2WctEcRqLj9IAz0noeqh2M3yHKd8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua"; meta.homepage = "https://github.com/TimUntersberger/neogit";
}; };
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "1644922901"; version = "1645996112";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "1d1f043acf025f919b8dd12bb672569109c7f099"; rev = "06aefb1867687ee2b1d206fd5d19a2b254c62f2c";
sha256 = "8GhjHKQOjiuA++mugHow8jDXhsaY922I6KwGlMu3kfE="; sha256 = "D9DC7ekGupRbMpE/jbouphRK0yjtEx957gPXve1djvY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
}; };
spellsitter-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { spellsitter-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "spellsitter.nvim"; pname = "spellsitter.nvim";
version = "1643372092"; version = "1645219331";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "spellsitter.nvim"; repo = "spellsitter.nvim";
rev = "db761f656f06ea07323b997b0af358a73ba7f74d"; rev = "0a19491a9c15c0b9283a6698e31ea7471419d5f8";
sha256 = "k6W+T4Q+CK7VprWFsRYnvSmrA88E9yOdrBiQ4OPHl3g="; sha256 = "jkl7TDaR8E+vsOgZ0vdMDT/q4LSiZgc1G/uqKB+3A2c=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/lewis6991/spellsitter.nvim"; meta.homepage = "https://github.com/lewis6991/spellsitter.nvim";
}; };
nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-notify = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-notify"; pname = "nvim-notify";
version = "1644394369"; version = "1646210494";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "rcarriga"; owner = "rcarriga";
repo = "nvim-notify"; repo = "nvim-notify";
rev = "27f3176b950dc803b61c29bd007e140c232544e5"; rev = "f81b48d298c0ff7479b66568d9cc1a4794c196d0";
sha256 = "uJlJLF/ujFo6qhq7xkSZj1dXClve6jWtNE20kNk+mqw="; sha256 = "Xmf6oO7yHe4sHXVzEwjg0u4VZTLQDxYhnSvI2bb8nwg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta.homepage = "https://github.com/rcarriga/nvim-notify"; meta.homepage = "https://github.com/rcarriga/nvim-notify";

4
programs/nvim/plugins.yaml
View file

@ -1,7 +1,6 @@
# Fixes # Fixes
- src: lewis6991/impatient.nvim - src: lewis6991/impatient.nvim
- src: antoinemadec/FixCursorHold.nvim - src: antoinemadec/FixCursorHold.nvim
- src: delphinus/vim-auto-cursorline
# Utils # Utils
- src: nvim-lua/popup.nvim - src: nvim-lua/popup.nvim
@ -42,6 +41,7 @@
- src: jose-elias-alvarez/null-ls.nvim - src: jose-elias-alvarez/null-ls.nvim
- src: folke/trouble.nvim - src: folke/trouble.nvim
- src: onsails/lspkind-nvim - src: onsails/lspkind-nvim
- src: jubnzv/virtual-types.nvim
- src: nvim-lua/lsp-status.nvim - src: nvim-lua/lsp-status.nvim
- src: RRethy/vim-illuminate - src: RRethy/vim-illuminate
@ -77,7 +77,7 @@
- src: kyazdani42/nvim-tree.lua - src: kyazdani42/nvim-tree.lua
- src: lukas-reineke/indent-blankline.nvim - src: lukas-reineke/indent-blankline.nvim
- src: lukas-reineke/virt-column.nvim - src: lukas-reineke/virt-column.nvim
- src: norcalli/nvim-colorizer.lua - src: TimUntersberger/neogit
- src: lewis6991/gitsigns.nvim - src: lewis6991/gitsigns.nvim
- src: lewis6991/spellsitter.nvim - src: lewis6991/spellsitter.nvim
- src: rcarriga/nvim-notify - src: rcarriga/nvim-notify

30
programs/nvim/update-plugins.sh
View file

@ -53,16 +53,20 @@ for plugin in "${plugin_array[@]}"; do
version="$(date -d "$commit_date" "+%s")" version="$(date -d "$commit_date" "+%s")"
echo "${name} = pkgs.vimUtils.buildVimPluginFrom2Nix {" >>"$nix_new_file" {
echo "pname = \"${repo}\";" >>"$nix_new_file" echo "${name} = pkgs.vimUtils.buildVimPluginFrom2Nix {"
echo "version = \"${version}\";" >>"$nix_new_file" echo "pname = \"${repo}\";"
echo "src = ${src};" >>"$nix_new_file" echo "version = \"${version}\";"
echo "src = ${src};"
} >>"$nix_new_file"
build_inputs="$(echo "$plugin" | jq -r '.nativeBuildInputs // empty' | jq -r @sh)" build_inputs="$(echo "$plugin" | jq -r '.nativeBuildInputs // empty' | jq -r @sh)"
if [ -n "$build_inputs" ]; then if [ -n "$build_inputs" ]; then
echo -n "nativeBuildInputs = with pkgs; [" >>"$nix_new_file" {
echo -n "$build_inputs" | tr -d "'" >>"$nix_new_file" echo -n "nativeBuildInputs = with pkgs; ["
echo '];' >>"$nix_new_file" echo -n "$build_inputs" | tr -d "'"
echo '];'
} >>"$nix_new_file"
fi fi
build_phase="$(echo "$plugin" | jq -r '.buildPhase // empty')" build_phase="$(echo "$plugin" | jq -r '.buildPhase // empty')"
@ -70,8 +74,10 @@ for plugin in "${plugin_array[@]}"; do
printf "buildPhase = ''\n%s\n'';\n" "$build_phase" >>"$nix_new_file" printf "buildPhase = ''\n%s\n'';\n" "$build_phase" >>"$nix_new_file"
fi fi
echo "meta.homepage = \"https://github.com/${owner}/${repo}\";" >>"$nix_new_file" {
echo '};' >>"$nix_new_file" echo "meta.homepage = \"https://github.com/${owner}/${repo}\";"
echo '};'
} >>"$nix_new_file"
done done
echo "}" >>"$nix_new_file" echo "}" >>"$nix_new_file"
@ -79,7 +85,11 @@ nixpkgs-fmt "$nix_new_file"
if test -f "$nix_file"; then if test -f "$nix_file"; then
set +eo pipefail set +eo pipefail
diff -U 2 "$nix_file" "$nix_new_file" | bat --paging=never -ldiff if [ "$TERM" = "xterm-kitty" ]; then
kitty +kitten diff "$nix_file" "$nix_new_file"
else
diff -U 2 "$nix_file" "$nix_new_file" | bat --paging=never -ldiff
fi
set -eo pipefail set -eo pipefail
mv "$nix_new_file" "$nix_file" mv "$nix_new_file" "$nix_file"