nvim Updates
This commit is contained in:
parent
e7360fea7d
commit
c1f8623fef
13 changed files with 126 additions and 138 deletions
|
@ -1,5 +0,0 @@
|
||||||
vim.cmd('augroup nifoc_cusorline')
|
|
||||||
vim.cmd('autocmd!')
|
|
||||||
vim.cmd('autocmd FileType TelescopePrompt setlocal nocursorline')
|
|
||||||
vim.cmd('autocmd FileType NvimTree setlocal nocursorline')
|
|
||||||
vim.cmd('augroup end')
|
|
|
@ -4,10 +4,10 @@ local diagnostic_utils = require('nifoc.utils.diagnostic')
|
||||||
|
|
||||||
local function custom_attach(client, bufnr)
|
local function custom_attach(client, bufnr)
|
||||||
-- Plugin attachments
|
-- Plugin attachments
|
||||||
lsp_status.on_attach(client)
|
lsp_status.on_attach(client, bufnr)
|
||||||
|
|
||||||
if client.resolved_capabilities.document_highlight then
|
if client.resolved_capabilities.document_highlight then
|
||||||
require('illuminate').on_attach(client)
|
require('illuminate').on_attach(client, bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
if client.resolved_capabilities.code_lens then
|
if client.resolved_capabilities.code_lens then
|
||||||
|
|
|
@ -24,7 +24,7 @@ vim.g.nvim_tree_show_icons = {
|
||||||
files = 1,
|
files = 1,
|
||||||
}
|
}
|
||||||
|
|
||||||
vim.cmd('augroup nifoc_nvim_tree_telescope')
|
-- Autocmds
|
||||||
vim.cmd('autocmd!')
|
local augroup_nifoc_tree = vim.api.nvim_create_augroup("NifocTree", { clear = true })
|
||||||
vim.cmd('autocmd User TelescopeFindPre NvimTreeClose')
|
|
||||||
vim.cmd('augroup end')
|
vim.api.nvim_create_autocmd("User", { pattern = "TelescopeFindPre", command = 'NvimTreeClose', group = augroup_nifoc_tree })
|
||||||
|
|
|
@ -35,7 +35,19 @@ telescope.setup {
|
||||||
|
|
||||||
telescope.load_extension("zf-native")
|
telescope.load_extension("zf-native")
|
||||||
|
|
||||||
vim.cmd('augroup nifoc_telescope')
|
-- Autocmds
|
||||||
vim.cmd('autocmd!')
|
local augroup_nifoc_telescope = vim.api.nvim_create_augroup("NifocTelescope", { clear = true })
|
||||||
vim.cmd('autocmd User TelescopePreviewerLoaded let w:is_telescope=v:true')
|
|
||||||
vim.cmd('augroup end')
|
vim.api.nvim_create_autocmd("FileType", { pattern = "TelescopePrompt", callback = function()
|
||||||
|
vim.opt_local.cursorline = false
|
||||||
|
end, group = augroup_nifoc_telescope })
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("User" , { pattern = "TelescopePreviewerLoaded", command = "let w:is_telescope=v:true", group = augroup_nifoc_telescope })
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("BufWinEnter" , { callback = function()
|
||||||
|
if vim.w.is_telescope then
|
||||||
|
vim.opt_local.number = true
|
||||||
|
vim.opt_local.relativenumber = false
|
||||||
|
vim.opt_local.wrap = true
|
||||||
|
end
|
||||||
|
end, group = augroup_nifoc_telescope })
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
local wk = require('which-key')
|
local wk = require('which-key')
|
||||||
|
|
||||||
local npairs = require('nvim-autopairs')
|
local npairs = require('nvim-autopairs')
|
||||||
|
local fterm = require("FTerm")
|
||||||
|
|
||||||
local telescope = require('telescope')
|
local telescope = require('telescope')
|
||||||
local telescope_builtin = require('telescope.builtin')
|
local telescope_builtin = require('telescope.builtin')
|
||||||
|
@ -153,8 +154,8 @@ function M.setup()
|
||||||
vim.keymap.set('n', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
|
vim.keymap.set('n', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
|
||||||
vim.keymap.set('x', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
|
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.keymap.set('n', '<C-t>', fterm.toggle, {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.keymap.set('t', '<C-t>', '<C-\\><C-n><cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true})
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.lsp_attach(client, bufnr)
|
function M.lsp_attach(client, bufnr)
|
||||||
|
|
|
@ -22,9 +22,6 @@ vim.g.loaded_perl_provider = 0
|
||||||
|
|
||||||
-- Require Plugin Configuration
|
-- Require Plugin Configuration
|
||||||
|
|
||||||
-- Fixes
|
|
||||||
require('nifoc.config.cursorline')
|
|
||||||
|
|
||||||
-- Keybindings
|
-- Keybindings
|
||||||
require('nifoc.config.whichkey')
|
require('nifoc.config.whichkey')
|
||||||
require('nifoc.config.yoink')
|
require('nifoc.config.yoink')
|
||||||
|
|
|
@ -14,12 +14,11 @@ function M.maybe_enable_fixer(client, bufnr)
|
||||||
if client.resolved_capabilities.document_formatting and vim.b.nifoc_fixer_enabled == nil then
|
if client.resolved_capabilities.document_formatting and vim.b.nifoc_fixer_enabled == nil then
|
||||||
vim.api.nvim_buf_set_var(bufnr, 'nifoc_fixer_enabled', 1)
|
vim.api.nvim_buf_set_var(bufnr, 'nifoc_fixer_enabled', 1)
|
||||||
|
|
||||||
vim.cmd [[
|
local augroup_nifoc_diagnostic = vim.api.nvim_create_augroup("NifocDiagnostic", { clear = true })
|
||||||
augroup nifoc_diagnostic_formatting
|
|
||||||
autocmd! * <buffer>
|
vim.api.nvim_create_autocmd("BufWritePre", { callback = function()
|
||||||
autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_sync(nil, 1000)
|
vim.lsp.buf.formatting_sync(nil, 1000)
|
||||||
augroup end
|
end, group = augroup_nifoc_diagnostic, buffer = bufnr })
|
||||||
]]
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,35 +1,10 @@
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
local check_disable = function()
|
|
||||||
local buftype = vim.bo.buftype
|
|
||||||
return buftype == 'terminal' or buftype == 'nofile'
|
|
||||||
end
|
|
||||||
|
|
||||||
local check_toggle = function()
|
|
||||||
if check_disable() then
|
|
||||||
return false
|
|
||||||
elseif vim.w.is_telescope then
|
|
||||||
return false
|
|
||||||
else
|
|
||||||
local toggle_line_style = vim.b.toggle_line_style
|
|
||||||
return toggle_line_style == nil or toggle_line_style == 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function M.maybe_set_special_style()
|
|
||||||
if check_disable() then
|
|
||||||
vim.opt_local.number = false
|
|
||||||
vim.opt_local.relativenumber = false
|
|
||||||
end
|
|
||||||
|
|
||||||
if vim.w.is_telescope then
|
|
||||||
vim.opt_local.number = true
|
|
||||||
vim.opt_local.relativenumber = false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function M.maybe_set_relativenumber(value)
|
function M.maybe_set_relativenumber(value)
|
||||||
if check_toggle() then
|
local toggle_line_style = vim.b.toggle_line_style
|
||||||
|
local do_toggle = toggle_line_style == nil or toggle_line_style == 1
|
||||||
|
|
||||||
|
if do_toggle then
|
||||||
vim.opt_local.relativenumber = value
|
vim.opt_local.relativenumber = value
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -64,7 +64,8 @@ vim.opt.shortmess:append('c')
|
||||||
vim.opt.shortmess:remove('S')
|
vim.opt.shortmess:remove('S')
|
||||||
|
|
||||||
vim.opt.termguicolors = true
|
vim.opt.termguicolors = true
|
||||||
vim.cmd('set mouse=a mousemodel=popup_setpos')
|
vim.opt.mouse = 'a'
|
||||||
|
vim.opt.mousemodel = 'popup_setpos'
|
||||||
|
|
||||||
-- Plugins
|
-- Plugins
|
||||||
require('nifoc.config.themes')
|
require('nifoc.config.themes')
|
||||||
|
@ -94,21 +95,27 @@ vim.g.clipboard = {
|
||||||
cache_enabled = 0,
|
cache_enabled = 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
vim.cmd('set clipboard+=unnamedplus')
|
vim.opt.clipboard:prepend('unnamedplus')
|
||||||
|
|
||||||
-- Keymap
|
-- Keymap
|
||||||
require('nifoc.keymap').setup()
|
require('nifoc.keymap').setup()
|
||||||
|
|
||||||
-- Autocmds
|
-- Autocmds
|
||||||
vim.cmd('augroup nifoc_numbertoggle')
|
local augroup_nifoc_init = vim.api.nvim_create_augroup("NifocInit", { clear = true })
|
||||||
vim.cmd('autocmd!')
|
|
||||||
vim.cmd("autocmd BufEnter,BufWinEnter * lua require('nifoc.utils.line_style').maybe_set_special_style()")
|
|
||||||
vim.cmd('autocmd TermOpen * setlocal nonumber norelativenumber')
|
|
||||||
vim.cmd("autocmd BufEnter,InsertLeave * lua require('nifoc.utils.line_style').maybe_set_relativenumber(true)")
|
|
||||||
vim.cmd("autocmd BufLeave,InsertEnter * lua require('nifoc.utils.line_style').maybe_set_relativenumber(false)")
|
|
||||||
vim.cmd('augroup end')
|
|
||||||
|
|
||||||
vim.cmd('augroup nifoc_yank')
|
vim.api.nvim_create_autocmd("InsertEnter", { callback = function()
|
||||||
vim.cmd('autocmd!')
|
require('nifoc.utils.line_style').maybe_set_relativenumber(false)
|
||||||
vim.cmd('autocmd TextYankPost * silent! lua vim.highlight.on_yank{higroup="IncSearch", timeout=500}')
|
end, group = augroup_nifoc_init })
|
||||||
vim.cmd('augroup end')
|
|
||||||
|
vim.api.nvim_create_autocmd("InsertLeave", { callback = function()
|
||||||
|
require('nifoc.utils.line_style').maybe_set_relativenumber(true)
|
||||||
|
end, group = augroup_nifoc_init })
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("TermOpen", { callback = function()
|
||||||
|
vim.opt_local.number = false
|
||||||
|
vim.opt_local.relativenumber = false
|
||||||
|
end, group = augroup_nifoc_init })
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("TextYankPost", { callback = function()
|
||||||
|
vim.highlight.on_yank{higroup="IncSearch", timeout=500}
|
||||||
|
end, group = augroup_nifoc_init })
|
||||||
|
|
36
flake.lock
36
flake.lock
|
@ -38,11 +38,11 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1629481132,
|
"lastModified": 1644229661,
|
||||||
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
|
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "997f7efcb746a9c140ce1f13c72263189225f482",
|
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -73,11 +73,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1645970334,
|
"lastModified": 1646559628,
|
||||||
"narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=",
|
"narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25",
|
"rev": "afe96e7433c513bf82375d41473c57d1f66b4e68",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -96,11 +96,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "contrib",
|
"dir": "contrib",
|
||||||
"lastModified": 1646204719,
|
"lastModified": 1647043711,
|
||||||
"narHash": "sha256-qD7dl57gpQ14KUWv1MIGBfLrH1eXRJqi1cICh/B2laE=",
|
"narHash": "sha256-SZ+9sNePKXyjuw8XdY9Di26R/SUmBMKGqPJ0GxgW68g=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "4b3f920477e9838c3f3a9cd67a47d1494b9cc229",
|
"rev": "08d9d74fd91adb29e1f71a48a21df955568cdfcb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -119,11 +119,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1646208901,
|
"lastModified": 1647072856,
|
||||||
"narHash": "sha256-tGk12hIfSSzjsH3EhIa9fJxMpVYWBqGXWu+JPmmb9PU=",
|
"narHash": "sha256-4S7Jf0nMww0+JAuV+XyooZwJnYA9j3LNdA4AIh+4D2A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "66c878478683e72bdd346984cbcabe0c4eccee81",
|
"rev": "537cd7fa0d26ca75743d21d76adc6aaefca25a88",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -154,11 +154,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1646121518,
|
"lastModified": 1646955661,
|
||||||
"narHash": "sha256-CgsJPJImnCOvUyTUHoCNaSJk/7Ozv2T1aPwS++O3gkI=",
|
"narHash": "sha256-AYLta1PubJnrkv15+7G+6ErW5m9NcI9wSdJ+n7pKAe0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "684c73c9e6ac8f4d0c6dea3251292e758ac375b5",
|
"rev": "e9545762b032559c27d8ec9141ed63ceca1aa1ac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -186,11 +186,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1646181315,
|
"lastModified": 1647045120,
|
||||||
"narHash": "sha256-FMjMB5fF3ln5ccSypaJdzWHrOWzubRXcYoaB8f6VhsE=",
|
"narHash": "sha256-zYBhU8yxHyBYyZh+jEF0NUkuAt82WoSHcWEwBB5grJQ=",
|
||||||
"owner": "arqv",
|
"owner": "arqv",
|
||||||
"repo": "zig-overlay",
|
"repo": "zig-overlay",
|
||||||
"rev": "e4e0e1c3be80340b0f644f4ff18f63e1f9b0e478",
|
"rev": "4a7d861ca3bbf34ab85b9248e5513856e929ee78",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -31,8 +31,10 @@ in
|
||||||
let $PATH = substitute($PATH, xcode_path, ":", "") . substitute(xcode_path, ":$", "", "")
|
let $PATH = substitute($PATH, xcode_path, ":", "") . substitute(xcode_path, ":$", "", "")
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
lua require('impatient')
|
lua << EOF
|
||||||
lua require('nix_init')
|
require('impatient')
|
||||||
|
require('nix_init')
|
||||||
|
EOF
|
||||||
'';
|
'';
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
|
|
|
@ -39,12 +39,12 @@
|
||||||
};
|
};
|
||||||
plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
plenary-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "plenary.nvim";
|
pname = "plenary.nvim";
|
||||||
version = "1646238606";
|
version = "1646401868";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "nvim-lua";
|
owner = "nvim-lua";
|
||||||
repo = "plenary.nvim";
|
repo = "plenary.nvim";
|
||||||
rev = "d742fd9c4a311ea9351eebef4c91e50d5960dd1e";
|
rev = "14dfb4071022b22e08384ee125a5607464b6d397";
|
||||||
sha256 = "+0fc3eVwWeHKJJYLCcCMAwFQIjJjEJSRA1e0U8mrnEs=";
|
sha256 = "nxB5Gx0xI1oREcFHNKbCWdKGoqnZFqKgHE/EOU/Kgxk=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-lua/plenary.nvim";
|
meta.homepage = "https://github.com/nvim-lua/plenary.nvim";
|
||||||
|
@ -111,12 +111,12 @@
|
||||||
};
|
};
|
||||||
lightspeed-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
lightspeed-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "lightspeed.nvim";
|
pname = "lightspeed.nvim";
|
||||||
version = "1646047482";
|
version = "1646869851";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "ggandor";
|
owner = "ggandor";
|
||||||
repo = "lightspeed.nvim";
|
repo = "lightspeed.nvim";
|
||||||
rev = "23565bcdd45afea0c899c71a367b14fc121dbe13";
|
rev = "58c9e321b188e040703b01f16922623911f11117";
|
||||||
sha256 = "005p+Ytc7Tdmwcni2Z5AibkAKY/dCgH8eEtDY0QDG4Q=";
|
sha256 = "2rV0s8H3Fey7VjO+4xOZCfglB7ebXZky/N2oZKY1PPU=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ggandor/lightspeed.nvim";
|
meta.homepage = "https://github.com/ggandor/lightspeed.nvim";
|
||||||
|
@ -135,12 +135,12 @@
|
||||||
};
|
};
|
||||||
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-treesitter";
|
pname = "nvim-treesitter";
|
||||||
version = "1646255537";
|
version = "1647111747";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "nvim-treesitter";
|
owner = "nvim-treesitter";
|
||||||
repo = "nvim-treesitter";
|
repo = "nvim-treesitter";
|
||||||
rev = "5b6f6ae30c1cf8fceefe08a9bcf799870558a878";
|
rev = "69a02b88d8ca937b2e00ecba947f62f115bead90";
|
||||||
sha256 = "AYHc/sRJM4jW0+CMbWYX78368cgzYrLWAwtb8pDuNsE=";
|
sha256 = "tyMXyW/sClSORuYP6Zhdf7PvsDpjmcJPLdjnIile6N0=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter";
|
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter";
|
||||||
|
@ -171,12 +171,12 @@
|
||||||
};
|
};
|
||||||
telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
telescope-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "telescope.nvim";
|
pname = "telescope.nvim";
|
||||||
version = "1645627005";
|
version = "1647100146";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "nvim-telescope";
|
owner = "nvim-telescope";
|
||||||
repo = "telescope.nvim";
|
repo = "telescope.nvim";
|
||||||
rev = "567ec85b157f1606b500a0f755181f284810a28e";
|
rev = "1e4d5e59df389d26b772d525abe2b1a14b2b4099";
|
||||||
sha256 = "VnALUaFRiVf+sKgAFNcyKuIChYJd8PwG8OOl90Ww7d8=";
|
sha256 = "6mefI2KqIScM4v8Vu6GjpcOw29vQSTyBn6mXCrLtjQo=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim";
|
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim";
|
||||||
|
@ -191,7 +191,7 @@
|
||||||
sha256 = "+Ku+MEczj+KSLb0rcqKhAQAMdm+PeiFMLrVp1lIIpDI=";
|
sha256 = "+Ku+MEczj+KSLb0rcqKhAQAMdm+PeiFMLrVp1lIIpDI=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
nativeBuildInputs = with pkgs; [ just zigpkgs."0.9.0" ];
|
nativeBuildInputs = with pkgs; [ just zigpkgs."0.9.1" ];
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
just clean
|
just clean
|
||||||
XDG_CACHE_HOME=./xdg_cache just build
|
XDG_CACHE_HOME=./xdg_cache just build
|
||||||
|
@ -226,24 +226,24 @@
|
||||||
};
|
};
|
||||||
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
nvim-lspconfig = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-lspconfig";
|
pname = "nvim-lspconfig";
|
||||||
version = "1646161201";
|
version = "1646865212";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "neovim";
|
owner = "neovim";
|
||||||
repo = "nvim-lspconfig";
|
repo = "nvim-lspconfig";
|
||||||
rev = "cdc2ec53e028d32f06c51ef8b2837ebb8460ef45";
|
rev = "096398a07c2dc08d785266f9f55ddcb462ba0749";
|
||||||
sha256 = "VVU1n8dROoI95pYsh4RUh3EBR/VZoXZc4GcGQ2pNcu0=";
|
sha256 = "ATH0h3d3EVBq96tptitKdzRLrGAeKfdNhgbsmJoF6xU=";
|
||||||
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 = "1646144986";
|
version = "1647110590";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "jose-elias-alvarez";
|
owner = "jose-elias-alvarez";
|
||||||
repo = "null-ls.nvim";
|
repo = "null-ls.nvim";
|
||||||
rev = "a1804de23ce354c982aa08c57d3ed89aad8a15a9";
|
rev = "abaff6ed4dad96831031fc55a6ef55ac7bc57e13";
|
||||||
sha256 = "5mNKC9OQZNwml0c4+gBpzq8d8VYgCb+W9vsrWUmO66c=";
|
sha256 = "2zVxKYQEV+TmOCSnowesVOEqCeX01Ri442pWxkuacIg=";
|
||||||
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";
|
||||||
|
@ -346,12 +346,12 @@
|
||||||
};
|
};
|
||||||
LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
LuaSnip = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "LuaSnip";
|
pname = "LuaSnip";
|
||||||
version = "1645909536";
|
version = "1646995094";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "L3MON4D3";
|
owner = "L3MON4D3";
|
||||||
repo = "LuaSnip";
|
repo = "LuaSnip";
|
||||||
rev = "7c634ddf7ff99245ef993b5fa459c3b61e905075";
|
rev = "5d62337e4354ed0eae3b7dba4c2c289cea117c19";
|
||||||
sha256 = "W45XfZ6QWnp0l2oa54KlhGfHGrYL5uXIWpMqmw7VeGg=";
|
sha256 = "m575EGCw1heSJbFag6QRUh9Tw/Gg3U5DSjded0RQw28=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/L3MON4D3/LuaSnip";
|
meta.homepage = "https://github.com/L3MON4D3/LuaSnip";
|
||||||
|
@ -442,36 +442,36 @@
|
||||||
};
|
};
|
||||||
nvim-autopairs = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
nvim-autopairs = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "nvim-autopairs";
|
pname = "nvim-autopairs";
|
||||||
version = "1646193452";
|
version = "1646569977";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "windwp";
|
owner = "windwp";
|
||||||
repo = "nvim-autopairs";
|
repo = "nvim-autopairs";
|
||||||
rev = "771fda8d169384d345c8bbf2f871b75ba4a2dee5";
|
rev = "d2cde7c5802b34d6391a8a3555a3b7b56482f2aa";
|
||||||
sha256 = "fLphqZ6vZ3iodwXEbOMW9vQoIPB0i1ff48erYPKuksQ=";
|
sha256 = "oxrWiWV5W5D+X8atJY4Cfbp/EZUI0zIYZMV1ujCVcbE=";
|
||||||
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 = "1646129907";
|
version = "1646385778";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "windwp";
|
owner = "windwp";
|
||||||
repo = "nvim-ts-autotag";
|
repo = "nvim-ts-autotag";
|
||||||
rev = "887fcd9e45ff112c4f39d2a8ba2594d04b99752a";
|
rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2";
|
||||||
sha256 = "35CKLPWxtPDun94uBVpfg7Xume6a5MtY3i3yhJqb2wQ=";
|
sha256 = "gYm8/MLCBBhrH1vSrBxK33wOtG5CYaXJWn9N5e4a0hk=";
|
||||||
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 = "1645002769";
|
version = "1647079487";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "numToStr";
|
owner = "numToStr";
|
||||||
repo = "Comment.nvim";
|
repo = "Comment.nvim";
|
||||||
rev = "18a8dc0bbdfc089d5f5a850e4640d8e75381c598";
|
rev = "399f92d57900ddeefe384f156e2d11fc93a93356";
|
||||||
sha256 = "uH4Z3GFFMF6mHO0TC0lo4OnhIehUzcWOlwPpGQNT2wM=";
|
sha256 = "iyIxNxrvcWpVbzDAugAEP9j/BV7mLpWTYipgknXQKkA=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/numToStr/Comment.nvim";
|
meta.homepage = "https://github.com/numToStr/Comment.nvim";
|
||||||
|
@ -526,48 +526,48 @@
|
||||||
};
|
};
|
||||||
lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
lualine-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "lualine.nvim";
|
pname = "lualine.nvim";
|
||||||
version = "1646229778";
|
version = "1646668162";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "nvim-lualine";
|
owner = "nvim-lualine";
|
||||||
repo = "lualine.nvim";
|
repo = "lualine.nvim";
|
||||||
rev = "32c85cd214c387fd4883ccb18257e0204184fb85";
|
rev = "88a44ade818f9ee7ba730aa4096250e22b243808";
|
||||||
sha256 = "tfg7brrB8uLt+wnytlUinRm48beycI8jelF2UvxM/EM=";
|
sha256 = "F7R5V70ta/9s9qn+QkZtk5AFb/PfKtuOqPHP/Y6/WHI=";
|
||||||
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 = "1645739918";
|
version = "1646838127";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "akinsho";
|
owner = "akinsho";
|
||||||
repo = "bufferline.nvim";
|
repo = "bufferline.nvim";
|
||||||
rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537";
|
rev = "d5904e8a3434acb151a4948b1b3d4760a2a12bb1";
|
||||||
sha256 = "NDR5O0+Gxsml9XF6g4pPFlTwYay/1eHEmCaaQM0bgfc=";
|
sha256 = "PK8jgMxjjQqIuEAQ066sGc4hIH7TiRXizQUTpzsiIOc=";
|
||||||
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 = "1646253725";
|
version = "1647093634";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "kyazdani42";
|
owner = "kyazdani42";
|
||||||
repo = "nvim-tree.lua";
|
repo = "nvim-tree.lua";
|
||||||
rev = "866442fd2c314ea020a670f4224e2038d46bbd4c";
|
rev = "d93a93c9c1a12748f09c5e01867908e9985cfccc";
|
||||||
sha256 = "PSFkJF/cWMWptZ37zl6/gl19sG462loax60zS/PyVEU=";
|
sha256 = "TPnUUOk4Y6fIY5igMIvRS6tUMKCzc+BLPpPXJP1N+pE=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua";
|
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua";
|
||||||
};
|
};
|
||||||
indent-blankline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
indent-blankline-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "indent-blankline.nvim";
|
pname = "indent-blankline.nvim";
|
||||||
version = "1642829036";
|
version = "1646791761";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "lukas-reineke";
|
owner = "lukas-reineke";
|
||||||
repo = "indent-blankline.nvim";
|
repo = "indent-blankline.nvim";
|
||||||
rev = "2e35f7dcdc72f39b37c21e43cdb538d7a41c7e07";
|
rev = "9915d46ba9361784c70036bb7259c436249e5b0c";
|
||||||
sha256 = "ik7GDbctby+fzk+TX2A3NQNN7zq2smOxDcEeWsc88sE=";
|
sha256 = "ZDNRTgk5Aqx42T7mBalDMNdkhn7IG5xAcqK+e+Gpjj0=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim";
|
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim";
|
||||||
|
@ -586,24 +586,24 @@
|
||||||
};
|
};
|
||||||
neogit = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
neogit = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "neogit";
|
pname = "neogit";
|
||||||
version = "1645786671";
|
version = "1646486476";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "TimUntersberger";
|
owner = "TimUntersberger";
|
||||||
repo = "neogit";
|
repo = "neogit";
|
||||||
rev = "3bba2b63417cb679313e0ed0b7d9b7539c7f02b0";
|
rev = "f30879799f7c19d0047c6f3d3a86b818eaf0f201";
|
||||||
sha256 = "Jc0b8PeEzB/3AZ+2WctEcRqLj9IAz0noeqh2M3yHKd8=";
|
sha256 = "KP34tdI+hHYUEmFYhLb996zQl51aoTVhUnaexNwv1a0=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/TimUntersberger/neogit";
|
meta.homepage = "https://github.com/TimUntersberger/neogit";
|
||||||
};
|
};
|
||||||
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
gitsigns-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
|
||||||
pname = "gitsigns.nvim";
|
pname = "gitsigns.nvim";
|
||||||
version = "1645996112";
|
version = "1647007951";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "lewis6991";
|
owner = "lewis6991";
|
||||||
repo = "gitsigns.nvim";
|
repo = "gitsigns.nvim";
|
||||||
rev = "06aefb1867687ee2b1d206fd5d19a2b254c62f2c";
|
rev = "7de953329ff696408bd38d3218b0239839d285e0";
|
||||||
sha256 = "D9DC7ekGupRbMpE/jbouphRK0yjtEx957gPXve1djvY=";
|
sha256 = "Q47mMcv4esfqSJMNFF1kr8Zi5mjzSkQVrpLsMM7AzXc=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
|
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
- src: natecraddock/telescope-zf-native.nvim
|
- src: natecraddock/telescope-zf-native.nvim
|
||||||
nativeBuildInputs:
|
nativeBuildInputs:
|
||||||
- just
|
- just
|
||||||
- zigpkgs."0.9.0"
|
- zigpkgs."0.9.1"
|
||||||
buildPhase: |-
|
buildPhase: |-
|
||||||
just clean
|
just clean
|
||||||
XDG_CACHE_HOME=./xdg_cache just build
|
XDG_CACHE_HOME=./xdg_cache just build
|
||||||
|
|
Loading…
Reference in a new issue