all functionality restored, switching to vim.pack
This commit is contained in:
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1775423009,
|
||||
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
32
flake.nix
32
flake.nix
@@ -11,12 +11,12 @@
|
||||
system = "x86_64-linux"; # change if needed
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
pkgList = with pkgs; [
|
||||
|
||||
# LSPs
|
||||
lua-language-server
|
||||
vscode-langservers-extracted
|
||||
emmet-ls
|
||||
rust-analyzer
|
||||
ast-grep
|
||||
prettier
|
||||
black
|
||||
nixfmt
|
||||
@@ -33,32 +33,10 @@
|
||||
tree-sitter
|
||||
ripgrep
|
||||
gcc
|
||||
fzf
|
||||
gnumake
|
||||
imagemagick
|
||||
luajitPackages.magick
|
||||
ghostscript
|
||||
luarocks
|
||||
|
||||
(texlive.combine {
|
||||
inherit (texlive)
|
||||
scheme-basic
|
||||
varwidth
|
||||
preview
|
||||
mathtools
|
||||
amsfonts
|
||||
amscdx
|
||||
xcolor
|
||||
dvisvgm
|
||||
dvipng
|
||||
wrapfig
|
||||
standalone
|
||||
graphicxbox
|
||||
amsmath
|
||||
ulem
|
||||
hyperref
|
||||
capt-of
|
||||
;
|
||||
})
|
||||
];
|
||||
|
||||
nvim-wrapped = pkgs.symlinkJoin {
|
||||
@@ -85,12 +63,6 @@
|
||||
export TREE_SITTER_LIB_PATH="${pkgs.tree-sitter}/lib"
|
||||
echo "Neovim LSP environment loaded"
|
||||
export DEVSHELL_NAME=" flake/#89dceb"
|
||||
|
||||
# Trigger zsh
|
||||
if [[ -z "$ZSH_VERSION" ]]; then
|
||||
exec zsh
|
||||
fi
|
||||
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
7
init.lua
7
init.lua
@@ -1,4 +1,9 @@
|
||||
require("config.lazy")
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = ","
|
||||
|
||||
require("plugins.init")
|
||||
require("config.autocmd")
|
||||
require("config.binds")
|
||||
|
||||
-- Colorcheme
|
||||
vim.cmd.colorscheme("catppuccin-mocha")
|
||||
|
||||
@@ -42,3 +42,34 @@ vim.api.nvim_create_autocmd({ "WinLeave" }, {
|
||||
vim.opt_local.cursorline = false
|
||||
end,
|
||||
})
|
||||
|
||||
local group = vim.api.nvim_create_augroup("autosave", {})
|
||||
|
||||
-- Notification to say when a file is saved by autosave
|
||||
vim.api.nvim_create_autocmd("User", {
|
||||
pattern = "AutoSaveWritePre",
|
||||
group = group,
|
||||
callback = function(opts)
|
||||
if opts.data.saved_buffer ~= nil then
|
||||
local filename = vim.fn.expand("%:t")
|
||||
print("Saved '" .. filename .. "' at " .. vim.fn.strftime("%H:%M:%S"))
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
-- Notification when enabling/disabling autosave for a buffer
|
||||
vim.api.nvim_create_autocmd("User", {
|
||||
pattern = "AutoSaveEnable",
|
||||
group = group,
|
||||
callback = function()
|
||||
print("AutoSave enabled")
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("User", {
|
||||
pattern = "AutoSaveDisable",
|
||||
group = group,
|
||||
callback = function()
|
||||
print("AutoSave disabled")
|
||||
end,
|
||||
})
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
-- Keymap function
|
||||
function Keymap(mode, key, binding)
|
||||
vim.keymap.set(mode, key, binding, { noremap = true, silent = true })
|
||||
function Keymap(mode, key, binding, opts)
|
||||
local options = { noremap = true, silent = true }
|
||||
if opts then
|
||||
options = vim.tbl_extend("force", options, opts)
|
||||
end
|
||||
vim.keymap.set(mode, key, binding, options)
|
||||
end
|
||||
|
||||
Keymap("n", "q:", ":") -- remove nonsense command
|
||||
@@ -9,21 +13,74 @@ Keymap("n", "<leader>bd", function() -- delete buffer
|
||||
vim.cmd("echo 'Buffer deleted'")
|
||||
end)
|
||||
|
||||
for bind = "i", "a", "A" do -- proper indenting function
|
||||
for _, bind in ipairs({ "i", "a", "A" }) do
|
||||
-- Pass { expr = true } as the fourth argument
|
||||
Keymap("n", bind, function()
|
||||
if vim.fn.getline("."):match("^%s*$") then
|
||||
return [["_cc]]
|
||||
else
|
||||
return bind
|
||||
end
|
||||
end)
|
||||
end, { expr = true })
|
||||
end
|
||||
|
||||
Keymap("i", "<C-BS>", "<C-W>") -- C-Backscpace for whole words
|
||||
|
||||
-- Open Lazygit
|
||||
Keymap("n", "<leader>l", function()
|
||||
Snacks.lazygit.open()
|
||||
Keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>") -- Diagnostics for Linter
|
||||
|
||||
-- Flash keymaps
|
||||
Keymap("n", "ss", function()
|
||||
require("flash").jump()
|
||||
end)
|
||||
Keymap("n", "S", function()
|
||||
require("flash").treesitter()
|
||||
end)
|
||||
Keymap("n", "<leader>r", function()
|
||||
require("flash").remote()
|
||||
end)
|
||||
Keymap("n", "<leader>R", function()
|
||||
require("flash").treesitter_search()
|
||||
end)
|
||||
|
||||
Keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>") -- Diagnostics for Linter
|
||||
-- Mini Session Keybinds
|
||||
Keymap("n", "<leader>qj", function() -- quit and save session local
|
||||
require("mini.sessions").write(".session")
|
||||
vim.cmd("wqa")
|
||||
end)
|
||||
|
||||
Keymap("n", "<leader>qd", function() -- quit and delete session
|
||||
require("mini.sessions").delete(".session")
|
||||
vim.cmd("wqa")
|
||||
end)
|
||||
|
||||
-- Telescope
|
||||
|
||||
local builtin = require("telescope.builtin")
|
||||
|
||||
Keymap("n", "<leader>ff", function()
|
||||
builtin.find_files({ hidden = true })
|
||||
end)
|
||||
|
||||
Keymap("n", "<space>fn", function()
|
||||
local full_path = vim.api.nvim_buf_get_name(0)
|
||||
local dir = vim.fn.fnamemodify(full_path, ":h")
|
||||
require("telescope").extensions.file_browser.file_browser({
|
||||
path = dir,
|
||||
})
|
||||
end)
|
||||
|
||||
Keymap("n", "<space>fs", function() -- select sessions
|
||||
MiniSessions.select()
|
||||
end)
|
||||
|
||||
Keymap("n", "<space>fd", function() -- select sessions
|
||||
MiniSessions.select("delete")
|
||||
end)
|
||||
|
||||
Keymap("n", "<leader>fg", function()
|
||||
builtin.live_grep({ hidden = true })
|
||||
end)
|
||||
|
||||
Keymap("n", "<leader>fb", function()
|
||||
builtin.buffers({ cwd = vim.fn.expand("%:p:h") }) -- buffers don’t need cwd, but harmless
|
||||
end)
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
-- Bootstrap lazy.nvim
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
-- Make sure to setup `mapleader` and `maplocalleader` before
|
||||
-- loading lazy.nvim so that mappings are correct.
|
||||
-- This is also a good place to setup other settings (vim.opt)
|
||||
vim.g.mapleader = " "
|
||||
vim.g.maplocalleader = ","
|
||||
|
||||
-- Setup lazy.nvim
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
-- import your plugins
|
||||
{ import = "plugins.utils" },
|
||||
{ import = "plugins" },
|
||||
{ import = "plugins.ui" },
|
||||
{ import = "plugins.editing" },
|
||||
{ import = "plugins.completion" },
|
||||
},
|
||||
-- Configure any other settings here. See the documentation for more details.
|
||||
-- colorscheme that will be used when installing plugins.
|
||||
install = { colorscheme = { "catppuccin" } },
|
||||
ui = {
|
||||
border = "rounded",
|
||||
},
|
||||
-- automatically check for plugin updates
|
||||
checker = { enabled = false },
|
||||
})
|
||||
@@ -1,50 +0,0 @@
|
||||
return {
|
||||
"saghen/blink.cmp",
|
||||
dependencies = {
|
||||
"L3MON4D3/LuaSnip",
|
||||
},
|
||||
opts = {
|
||||
-- Snippet configuration
|
||||
snippets = {
|
||||
preset = "luasnip", -- Tells blink.cmp to use LuaSnip
|
||||
},
|
||||
|
||||
fuzzy = { implementation = "lua" },
|
||||
|
||||
signature = {
|
||||
enabled = true,
|
||||
},
|
||||
|
||||
completion = {
|
||||
list = {
|
||||
selection = {
|
||||
preselect = false,
|
||||
auto_insert = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- Keymaps
|
||||
keymap = {
|
||||
["<Tab>"] = { "select_next", "snippet_forward", "fallback" },
|
||||
},
|
||||
sources = {
|
||||
default = {
|
||||
"lazydev",
|
||||
"lsp", -- (Equivalent to cmp-nvim-lsp)
|
||||
"snippets", -- (Handled by the snippets config, replaces cmp_luasnip source)
|
||||
"buffer", -- (Equivalent to cmp-buffer)
|
||||
"path", -- (Equivalent to cmp-path)
|
||||
-- "cmdline", -- Generally configured separately, but often included by default
|
||||
},
|
||||
providers = {
|
||||
lazydev = {
|
||||
name = "LazyDev",
|
||||
module = "lazydev.integrations.blink",
|
||||
-- make lazydev completions top priority (see `:h blink.cmp`)
|
||||
score_offset = 100,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
return {
|
||||
"stevearc/conform.nvim",
|
||||
config = function()
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/stevearc/conform.nvim", name = "conform" },
|
||||
{ src = "https://github.com/mfussenegger/nvim-lint", name = "lint" },
|
||||
})
|
||||
|
||||
require("conform").setup({
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
@@ -13,5 +15,34 @@ return {
|
||||
format_on_save = true,
|
||||
undojoin = true,
|
||||
})
|
||||
end,
|
||||
|
||||
local lint = require("lint")
|
||||
|
||||
-- Only show diagnostics close to the cursor
|
||||
vim.diagnostic.config({
|
||||
virtual_text = {
|
||||
spacing = 4,
|
||||
prefix = function(diagnostic)
|
||||
local icons = {
|
||||
[vim.diagnostic.severity.ERROR] = " ",
|
||||
[vim.diagnostic.severity.WARN] = " ",
|
||||
[vim.diagnostic.severity.INFO] = " ",
|
||||
[vim.diagnostic.severity.HINT] = " ",
|
||||
}
|
||||
return icons[diagnostic.severity] or ""
|
||||
end,
|
||||
},
|
||||
signs = false,
|
||||
underline = true,
|
||||
update_in_insert = false,
|
||||
})
|
||||
|
||||
-- Auto-run the linter only for the configured filetypes
|
||||
vim.api.nvim_create_autocmd("BufWritePost", {
|
||||
callback = function()
|
||||
local ft = vim.bo.filetype
|
||||
if lint.linters_by_ft[ft] then
|
||||
lint.try_lint()
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
return {
|
||||
"folke/lazydev.nvim",
|
||||
ft = "lua", -- only load on lua files
|
||||
opts = {
|
||||
library = {
|
||||
-- See the configuration section for more details
|
||||
-- Load luvit types when the `vim.uv` word is found
|
||||
{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
return {
|
||||
"mfussenegger/nvim-lint",
|
||||
config = function()
|
||||
local lint = require("lint")
|
||||
|
||||
-- Explicitly define linters for each file type (without ast_grep)
|
||||
lint.linters_by_ft = {
|
||||
python = { "flake8" },
|
||||
javascript = { "eslint" },
|
||||
typescript = { "eslint" },
|
||||
}
|
||||
|
||||
-- Only show diagnostics close to the cursor
|
||||
vim.diagnostic.config({
|
||||
virtual_text = {
|
||||
spacing = 4,
|
||||
-- You can make prefix dynamic based on severity using a function
|
||||
prefix = function(diagnostic)
|
||||
local icons = {
|
||||
[vim.diagnostic.severity.ERROR] = " ",
|
||||
[vim.diagnostic.severity.WARN] = " ",
|
||||
[vim.diagnostic.severity.INFO] = " ",
|
||||
[vim.diagnostic.severity.HINT] = " ",
|
||||
}
|
||||
return icons[diagnostic.severity] or "●"
|
||||
end,
|
||||
},
|
||||
signs = false,
|
||||
underline = true,
|
||||
update_in_insert = false,
|
||||
})
|
||||
|
||||
-- Auto-run the linter only for the configured filetypes
|
||||
vim.api.nvim_create_autocmd("BufWritePost", {
|
||||
pattern = "!*.lua",
|
||||
callback = function()
|
||||
local ft = vim.bo.filetype
|
||||
if lint.linters_by_ft[ft] then
|
||||
lint.try_lint()
|
||||
end
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function()
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/neovim/nvim-lspconfig", name = "lspconfig" },
|
||||
{ src = "https://github.com/saghen/blink.cmp", name = "blink" },
|
||||
})
|
||||
|
||||
vim.lsp.config("lua_ls", {
|
||||
settings = {
|
||||
Lua = {
|
||||
@@ -35,5 +37,69 @@ return {
|
||||
"rust_analyzer",
|
||||
"emmet_ls",
|
||||
})
|
||||
|
||||
vim.o.pumborder = "rounded"
|
||||
|
||||
require("blink.cmp").setup({
|
||||
|
||||
fuzzy = { implementation = "lua" },
|
||||
|
||||
signature = {
|
||||
enabled = true,
|
||||
},
|
||||
|
||||
completion = {
|
||||
list = {
|
||||
selection = {
|
||||
preselect = false,
|
||||
auto_insert = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- Keymaps
|
||||
keymap = {
|
||||
["<Tab>"] = { "select_next", "snippet_forward", "fallback" },
|
||||
},
|
||||
sources = {
|
||||
default = {
|
||||
-- "lazydev",
|
||||
"lsp", -- (Equivalent to cmp-nvim-lsp)
|
||||
"snippets", -- (Handled by the snippets config, replaces cmp_luasnip source)
|
||||
"buffer", -- (Equivalent to cmp-buffer)
|
||||
"path", -- (Equivalent to cmp-path)
|
||||
},
|
||||
providers = {
|
||||
-- lazydev = {
|
||||
-- name = "LazyDev",
|
||||
-- module = "lazydev.integrations.blink",
|
||||
-- -- make lazydev completions top priority (see `:h blink.cmp`)
|
||||
-- score_offset = 100,
|
||||
-- },
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", { -- Lazy load lazydev when in lua file (no pun intended)
|
||||
pattern = "lua",
|
||||
callback = function()
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/folke/lazydev.nvim", name = "lazydev" },
|
||||
})
|
||||
require("lazydev").setup()
|
||||
require("blink.cmp").setup({ -- Reload blink with lazydev as a source
|
||||
sources = {
|
||||
-- add lazydev to your completion providers
|
||||
default = { "lazydev", "lsp", "path", "snippets", "buffer" },
|
||||
providers = {
|
||||
lazydev = {
|
||||
name = "LazyDev",
|
||||
module = "lazydev.integrations.blink",
|
||||
-- make lazydev completions top priority (see `:h blink.cmp`)
|
||||
score_offset = 100,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,20 +1,17 @@
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
lazy = false,
|
||||
branch = "master",
|
||||
build = ":TSUpdate",
|
||||
config = function()
|
||||
require("nvim-treesitter.configs").setup({
|
||||
vim.pack.add({ { src = "https://github.com/nvim-treesitter/nvim-treesitter", name = "treesitter" } })
|
||||
|
||||
require("nvim-treesitter").setup({
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
ensure_installed = {
|
||||
})
|
||||
|
||||
require("nvim-treesitter").install({
|
||||
"bash",
|
||||
"html",
|
||||
"latex",
|
||||
"javascript",
|
||||
"json",
|
||||
"lua",
|
||||
"norg",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"query",
|
||||
@@ -24,7 +21,4 @@ return {
|
||||
"python",
|
||||
"vim",
|
||||
"yaml",
|
||||
},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
return {
|
||||
"folke/flash.nvim",
|
||||
event = "VeryLazy",
|
||||
---@type Flash.Config
|
||||
opts = {},
|
||||
keys = {
|
||||
{
|
||||
"ss",
|
||||
mode = { "n", "x", "o" },
|
||||
function()
|
||||
require("flash").jump()
|
||||
end,
|
||||
desc = "Flash",
|
||||
},
|
||||
{
|
||||
"S",
|
||||
mode = { "n", "x", "o" },
|
||||
function()
|
||||
require("flash").treesitter()
|
||||
end,
|
||||
desc = "Flash Treesitter",
|
||||
},
|
||||
{
|
||||
"<leader>r",
|
||||
mode = "o",
|
||||
function()
|
||||
require("flash").remote()
|
||||
end,
|
||||
desc = "Remote Flash",
|
||||
},
|
||||
{
|
||||
"<leader>R",
|
||||
mode = { "o", "x" },
|
||||
function()
|
||||
require("flash").treesitter_search()
|
||||
end,
|
||||
desc = "Treesitter Search",
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,106 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"nvim-neorg/neorg",
|
||||
lazy = true,
|
||||
ft = "norg",
|
||||
version = "*",
|
||||
dependencies = {
|
||||
{ "nvim-lua/plenary.nvim" },
|
||||
{ "nvim-neorg/neorg-telescope" },
|
||||
{ "benlubas/neorg-interim-ls" },
|
||||
},
|
||||
config = function()
|
||||
require("neorg").setup({
|
||||
load = {
|
||||
["core.defaults"] = {},
|
||||
["core.concealer"] = {},
|
||||
["core.qol.toc"] = {
|
||||
config = {
|
||||
close_after_use = true,
|
||||
},
|
||||
},
|
||||
["core.integrations.treesitter"] = {},
|
||||
["core.looking-glass"] = {},
|
||||
["core.itero"] = {
|
||||
config = {
|
||||
iterables = {
|
||||
"unordered_list%d",
|
||||
"ordered_list%d",
|
||||
"quote%d",
|
||||
},
|
||||
},
|
||||
},
|
||||
["core.completion"] = {
|
||||
config = { engine = { module_name = "external.lsp-completion" } },
|
||||
},
|
||||
["core.dirman"] = {
|
||||
config = {
|
||||
workspaces = {
|
||||
notes = "~/Notes",
|
||||
site = "~/Documents/voidarc/content/",
|
||||
},
|
||||
default_workspace = "notes",
|
||||
},
|
||||
},
|
||||
["core.integrations.telescope"] = {
|
||||
config = {
|
||||
insert_file_link = {
|
||||
-- Whether to show the title preview in telescope. Affects performance with a large
|
||||
-- number of files.
|
||||
show_title_preview = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
["external.interim-ls"] = {
|
||||
config = {
|
||||
-- default config shown
|
||||
completion_provider = {
|
||||
-- Enable or disable the completion provider
|
||||
enable = true,
|
||||
|
||||
-- Show file contents as documentation when you complete a file name
|
||||
documentation = true,
|
||||
|
||||
-- Try to complete categories provided by Neorg Query. Requires `benlubas/neorg-query`
|
||||
categories = false,
|
||||
|
||||
-- suggest heading completions from the given file for `{@x|}` where `|` is your cursor
|
||||
-- and `x` is an alphanumeric character. `{@name}` expands to `[name]{:$/people:# name}`
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
vim.wo.foldlevel = 99
|
||||
vim.wo.conceallevel = 2
|
||||
|
||||
vim.api.nvim_create_autocmd("Filetype", {
|
||||
pattern = "norg",
|
||||
callback = function()
|
||||
vim.keymap.set("n", "<CR>", "<Plug>(neorg.esupports.hop.hop-link.vsplit)", { buffer = true })
|
||||
vim.keymap.set("i", "<CR>", "<Plug>(neorg.itero.next-iteration)", { buffer = true })
|
||||
vim.keymap.set("n", "<localleader>m", "<cmd>Neorg inject-metadata<CR>", { buffer = true })
|
||||
vim.keymap.set("n", "<localleader>f", "<cmd>Telescope neorg insert_link<CR>", { buffer = true })
|
||||
vim.opt.colorcolumn = "140"
|
||||
vim.api.nvim_set_hl(0, "@neorg.tags.ranged_verbatim.code_block", { bg = "NONE" })
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"folke/snacks.nvim",
|
||||
config = function()
|
||||
require("snacks").setup({
|
||||
bigfile = {},
|
||||
lazygit = {},
|
||||
image = {
|
||||
enabled = true,
|
||||
math = {
|
||||
enabled = true,
|
||||
latex = {},
|
||||
},
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
return {
|
||||
"Aasim-A/scrollEOF.nvim",
|
||||
event = { "CursorMoved", "WinScrolled" },
|
||||
opts = {},
|
||||
}
|
||||
|
||||
@@ -1 +1,35 @@
|
||||
return {}
|
||||
local plugins = {}
|
||||
|
||||
-- 1. Setup paths
|
||||
local lua_path = vim.fn.stdpath("config") .. "/lua"
|
||||
local plugin_dir = lua_path .. "/plugins"
|
||||
|
||||
-- 2. Use ** to search recursively for all .lua files
|
||||
local files = vim.fn.split(vim.fn.globpath(plugin_dir, "**/*.lua"), "\n")
|
||||
|
||||
for _, file in ipairs(files) do
|
||||
-- Get path relative to the 'lua' directory
|
||||
-- Example: /home/user/.config/nvim/lua/plugins/ui/statusline.lua
|
||||
-- Becomes: plugins/ui/statusline.lua
|
||||
local relative_path = file:sub(#lua_path + 2)
|
||||
|
||||
-- Remove the .lua extension
|
||||
local module_path = relative_path:gsub("%.lua$", "")
|
||||
|
||||
-- Convert path slashes to Lua dots (plugins/ui/statusline -> plugins.ui.statusline)
|
||||
module_path = module_path:gsub("/", ".")
|
||||
|
||||
-- 3. The Guard: Don't require the current file (plugins.init)
|
||||
if not module_path:match("%.init$") and module_path ~= "plugins" then
|
||||
local status_ok, module_content = pcall(require, module_path)
|
||||
|
||||
if status_ok then
|
||||
table.insert(plugins, module_content)
|
||||
else
|
||||
-- Optional: notify if a file failed to load
|
||||
vim.notify("Error loading " .. module_path .. ": " .. module_content, vim.log.levels.ERROR)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return plugins
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
return {
|
||||
"catppuccin/nvim",
|
||||
name = "catppuccin",
|
||||
opts = {
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/catppuccin/nvim", name = "catppuccin" },
|
||||
{ src = "https://github.com/tadaa/vimade", name = "vimade" },
|
||||
})
|
||||
|
||||
require("catppuccin").setup({
|
||||
transparent_background = true, -- disables setting the background color.
|
||||
float = {
|
||||
transparent = true, -- enable transparent floating windows
|
||||
solid = false, -- use solid styling for floating windows, see |winborder|
|
||||
},
|
||||
show_end_of_buffer = true, -- shows the '~' characters after the end of buffers
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
require("vimade").setup({
|
||||
recipe = { "minimalist", { animate = true } },
|
||||
fadelevel = 0.6,
|
||||
})
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
return {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons", "archibate/lualine-time" },
|
||||
config = function()
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/nvim-lualine/lualine.nvim", name = "lualine" },
|
||||
{ src = "https://github.com/nvim-tree/nvim-web-devicons", name = "devicons" },
|
||||
{ src = "https://github.com/archibate/lualine-time", name = "lualine-time" },
|
||||
})
|
||||
|
||||
require("lualine").setup({
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
@@ -67,6 +69,3 @@ return {
|
||||
inactive_winbar = {},
|
||||
extensions = {},
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
return {
|
||||
"folke/noice.nvim",
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/folke/noice.nvim", name = "noice" },
|
||||
{ src = "https://github.com/MunifTanjim/nui.nvim", name = "nui" },
|
||||
{ src = "https://github.com/rcarriga/nvim-notify", name = "notify" },
|
||||
})
|
||||
|
||||
vim.notify = require("notify").setup({
|
||||
background_colour = "#000000",
|
||||
render = "compact",
|
||||
@@ -37,11 +39,3 @@ return {
|
||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||
},
|
||||
})
|
||||
end,
|
||||
dependencies = {
|
||||
-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
|
||||
"MunifTanjim/nui.nvim",
|
||||
"rcarriga/nvim-notify",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
return {
|
||||
"tadaa/vimade",
|
||||
opts = {
|
||||
recipe = { "minimalist", { animate = true } },
|
||||
fadelevel = 0.6,
|
||||
},
|
||||
}
|
||||
|
||||
23
lua/plugins/utils/convenience.lua
Normal file
23
lua/plugins/utils/convenience.lua
Normal file
@@ -0,0 +1,23 @@
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/okuuva/auto-save.nvim", name = "autosave" },
|
||||
{ src = "https://github.com/vladdoster/remember.nvim", name = "remember" },
|
||||
{ src = "https://github.com/Aasim-A/scrollEOF.nvim", name = "scrolleof" },
|
||||
{ src = "https://github.com/folke/flash.nvim", name = "flash" },
|
||||
})
|
||||
|
||||
require("auto-save").setup({
|
||||
enabled = true,
|
||||
trigger_events = {
|
||||
immediate_save = { "BufLeave", "FocusLost", "QuitPre", "VimSuspend" },
|
||||
defer_save = { "InsertLeave" }, -- save after debounce
|
||||
cancel_deferred_save = { "InsertEnter" }, -- cancel pending save
|
||||
},
|
||||
debounce_delay = 1000,
|
||||
noautocmd = true,
|
||||
})
|
||||
|
||||
-- enable remember
|
||||
require("remember").setup({})
|
||||
|
||||
-- enable scrolleof
|
||||
require("scrollEOF").setup()
|
||||
@@ -1,55 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"okuuva/auto-save.nvim",
|
||||
version = "^1.0.0", -- see https://devhints.io/semver, alternatively use '*' to use the latest tagged release
|
||||
cmd = "ASToggle", -- optional for lazy loading on command
|
||||
event = { "InsertLeave", "TextChanged" },
|
||||
opts = {},
|
||||
config = function(opts)
|
||||
require("auto-save").setup({
|
||||
enabled = true,
|
||||
trigger_events = { -- See :h events
|
||||
immediate_save = { "BufLeave", "FocusLost", "QuitPre", "VimSuspend" }, -- vim events that trigger an immediate save
|
||||
defer_save = { "InsertLeave" }, -- vim events that trigger a deferred save (saves after `debounce_delay`)
|
||||
cancel_deferred_save = { "InsertEnter" }, -- vim events that cancel a pending deferred save
|
||||
},
|
||||
debounce_delay = 1000,
|
||||
noautocmd = true,
|
||||
})
|
||||
local group = vim.api.nvim_create_augroup("autosave", {})
|
||||
|
||||
vim.api.nvim_create_autocmd("User", {
|
||||
pattern = "AutoSaveWritePre",
|
||||
group = group,
|
||||
callback = function(opts)
|
||||
if opts.data.saved_buffer ~= nil then
|
||||
local filename = vim.fn.expand("%:t")
|
||||
print("Saved '" .. filename .. "' at " .. vim.fn.strftime("%H:%M:%S"))
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("User", {
|
||||
pattern = "AutoSaveEnable",
|
||||
group = group,
|
||||
callback = function(opts)
|
||||
print("AutoSave enabled")
|
||||
end,
|
||||
})
|
||||
|
||||
vim.api.nvim_create_autocmd("User", {
|
||||
pattern = "AutoSaveDisable",
|
||||
group = group,
|
||||
callback = function(opts)
|
||||
print("AutoSave disabled")
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"vladdoster/remember.nvim",
|
||||
config = function()
|
||||
require("remember").setup({})
|
||||
end,
|
||||
},
|
||||
}
|
||||
@@ -1,8 +1,5 @@
|
||||
return {
|
||||
"echasnovski/mini.nvim",
|
||||
version = "",
|
||||
vim.pack.add({ { src = "https://github.com/echasnovski/mini.nvim", name = "mini" } })
|
||||
|
||||
config = function()
|
||||
require("mini.pairs").setup() -- Bracket pairs and stuff
|
||||
|
||||
require("mini.ai").setup() -- Around and In extension for visual mode
|
||||
@@ -41,33 +38,15 @@ return {
|
||||
|
||||
require("mini.icons").setup() -- Icon provider
|
||||
|
||||
-- local animate = require("mini.animate") -- animations ovs
|
||||
-- require("mini.animate").setup({
|
||||
-- cursor = {
|
||||
-- enable = false,
|
||||
-- },
|
||||
-- scroll = {
|
||||
-- -- Animate for 200 milliseconds with linear easing
|
||||
-- timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
|
||||
-- -- Animate equally but with at most 120 steps instead of default 60
|
||||
-- subscroll = animate.gen_subscroll.equal({ max_output_steps = 60 }),
|
||||
-- },
|
||||
-- open = {
|
||||
-- -- Animate for 400 milliseconds with linear easing
|
||||
-- timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
|
||||
-- -- Animate with wiping from nearest edge instead of default static one
|
||||
-- winconfig = animate.gen_winconfig.wipe({ direction = "from_edge" }),
|
||||
-- -- Make bigger windows more transparent
|
||||
-- winblend = animate.gen_winblend.linear({ from = 0, to = 0 }),
|
||||
-- },
|
||||
-- close = {
|
||||
-- -- Animate for 400 milliseconds with linear easing
|
||||
-- timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
|
||||
-- -- Animate with wiping to nearest edge instead of default static one
|
||||
-- winconfig = animate.gen_winconfig.wipe({ direction = "to_edge" }),
|
||||
-- -- Make bigger windows more transparent
|
||||
-- winblend = animate.gen_winblend.linear({ from = 0, to = 0 }),
|
||||
-- },
|
||||
-- })
|
||||
end,
|
||||
}
|
||||
local animate = require("mini.animate") -- animations ovs
|
||||
require("mini.animate").setup({
|
||||
cursor = {
|
||||
enable = false,
|
||||
},
|
||||
scroll = {
|
||||
-- Animate for 200 milliseconds with linear easing
|
||||
timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
|
||||
-- Animate equally but with at most 120 steps instead of default 60
|
||||
subscroll = animate.gen_subscroll.equal({ max_output_steps = 60 }),
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
return {
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
tag = "",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-telescope/telescope-symbols.nvim",
|
||||
"nvim-telescope/telescope-ui-select.nvim",
|
||||
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
|
||||
},
|
||||
config = function()
|
||||
vim.pack.add({
|
||||
{ src = "https://github.com/nvim-telescope/telescope.nvim", name = "telescope" },
|
||||
{ src = "https://github.com/nvim-lua/plenary.nvim", name = "plenary" },
|
||||
{ src = "https://github.com/nvim-telescope/telescope-symbols.nvim", name = "telescope-symbols" },
|
||||
{ src = "https://github.com/nvim-telescope/telescope-ui-select.nvim", name = "telescope-ui-select" },
|
||||
{ src = "https://github.com/nvim-telescope/telescope-fzf-native.nvim", name = "telescope-fzf" },
|
||||
{ src = "https://github.com/nvim-telescope/telescope-file-browser.nvim", name = "telescope-file-browser" },
|
||||
{ src = "https://github.com/2kabhishek/nerdy.nvim", name = "telescope-nerdy" },
|
||||
})
|
||||
|
||||
require("telescope").setup({
|
||||
defaults = {
|
||||
file_ignore_patterns = { ".git", ".venv", ".node_modules" },
|
||||
},
|
||||
pickers = {
|
||||
live_grep = {
|
||||
additional_args = function(opts)
|
||||
additional_args = function()
|
||||
return { "--hidden" }
|
||||
end,
|
||||
},
|
||||
@@ -32,52 +31,7 @@ return {
|
||||
},
|
||||
},
|
||||
})
|
||||
local builtin = require("telescope.builtin")
|
||||
|
||||
vim.keymap.set("n", "<leader>ff", function()
|
||||
builtin.find_files({ hidden = true })
|
||||
end, { desc = "Telescope find files (current file dir)" })
|
||||
|
||||
vim.keymap.set("n", "<space>fn", function()
|
||||
local full_path = vim.api.nvim_buf_get_name(0)
|
||||
local dir = vim.fn.fnamemodify(full_path, ":h")
|
||||
require("telescope").extensions.file_browser.file_browser({
|
||||
path = dir,
|
||||
})
|
||||
end)
|
||||
|
||||
vim.keymap.set("n", "<space>fs", function() -- select sessions
|
||||
MiniSessions.select()
|
||||
end)
|
||||
|
||||
vim.keymap.set("n", "<space>fd", function() -- select sessions
|
||||
MiniSessions.select("delete")
|
||||
end)
|
||||
|
||||
vim.keymap.set("n", "<leader>fg", function()
|
||||
builtin.live_grep({ hidden = true })
|
||||
end, { desc = "Telescope live grep (current file dir)" })
|
||||
|
||||
vim.keymap.set("n", "<leader>fb", function()
|
||||
builtin.buffers({ cwd = vim.fn.expand("%:p:h") }) -- buffers don’t need cwd, but harmless
|
||||
end, { desc = "Telescope buffers" })
|
||||
|
||||
require("telescope").load_extension("file_browser")
|
||||
require("telescope").load_extension("ui-select")
|
||||
require("telescope").load_extension("nerdy")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope-file-browser.nvim",
|
||||
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
|
||||
},
|
||||
{
|
||||
"2kabhishek/nerdy.nvim",
|
||||
cmd = "Nerdy",
|
||||
opts = {
|
||||
max_recents = 30, -- Configure recent icons limit
|
||||
copy_to_clipboard = false, -- Copy glyph to clipboard instead of inserting
|
||||
copy_register = "+", -- Register to use for copying (if `copy_to_clipboard` is true)
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
116
nvim-pack-lock.json
Normal file
116
nvim-pack-lock.json
Normal file
@@ -0,0 +1,116 @@
|
||||
{
|
||||
"plugins": {
|
||||
"autosave": {
|
||||
"rev": "9aabcb8396224dcbf8d51c0c1d620d88a46e89d7",
|
||||
"src": "https://github.com/okuuva/auto-save.nvim"
|
||||
},
|
||||
"blink": {
|
||||
"rev": "456d38d1cd3743926f329204c2340f3e7840aad6",
|
||||
"src": "https://github.com/saghen/blink.cmp"
|
||||
},
|
||||
"catppuccin": {
|
||||
"rev": "426dbebe06b5c69fd846ceb17b42e12f890aedf1",
|
||||
"src": "https://github.com/catppuccin/nvim"
|
||||
},
|
||||
"conform": {
|
||||
"rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
|
||||
"src": "https://github.com/stevearc/conform.nvim"
|
||||
},
|
||||
"devicons": {
|
||||
"rev": "c72328a5494b4502947a022fe69c0c47e53b6aa6",
|
||||
"src": "https://github.com/nvim-tree/nvim-web-devicons"
|
||||
},
|
||||
"flash": {
|
||||
"rev": "fcea7ff883235d9024dc41e638f164a450c14ca2",
|
||||
"src": "https://github.com/folke/flash.nvim"
|
||||
},
|
||||
"lazydev": {
|
||||
"rev": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d",
|
||||
"src": "https://github.com/folke/lazydev.nvim"
|
||||
},
|
||||
"lint": {
|
||||
"rev": "eab58b48eb11d7745c11c505e0f3057165902461",
|
||||
"src": "https://github.com/mfussenegger/nvim-lint"
|
||||
},
|
||||
"lspconfig": {
|
||||
"rev": "c588db330592fa477a70d2fee6ba20a57194bdc3",
|
||||
"src": "https://github.com/neovim/nvim-lspconfig"
|
||||
},
|
||||
"lspkind": {
|
||||
"rev": "c7274c48137396526b59d86232eabcdc7fed8a32",
|
||||
"src": "https://github.com/onsails/lspkind.nvim"
|
||||
},
|
||||
"lualine": {
|
||||
"rev": "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8",
|
||||
"src": "https://github.com/nvim-lualine/lualine.nvim"
|
||||
},
|
||||
"lualine-time": {
|
||||
"rev": "8838875e2e787293bb905d23dbb91ef4bde188ea",
|
||||
"src": "https://github.com/archibate/lualine-time"
|
||||
},
|
||||
"mini": {
|
||||
"rev": "69b7433355664cf76898eb86a12a019f39bd86d1",
|
||||
"src": "https://github.com/echasnovski/mini.nvim"
|
||||
},
|
||||
"neorg": {
|
||||
"rev": "1f14d72aad7165eac307a2a2f6be0fb97a04b3c2",
|
||||
"src": "https://github.com/nvim-neorg/neorg"
|
||||
},
|
||||
"noice": {
|
||||
"rev": "7bfd942445fb63089b59f97ca487d605e715f155",
|
||||
"src": "https://github.com/folke/noice.nvim"
|
||||
},
|
||||
"notify": {
|
||||
"rev": "8701bece920b38ea289b457f902e2ad184131a5d",
|
||||
"src": "https://github.com/rcarriga/nvim-notify"
|
||||
},
|
||||
"nui": {
|
||||
"rev": "de740991c12411b663994b2860f1a4fd0937c130",
|
||||
"src": "https://github.com/MunifTanjim/nui.nvim"
|
||||
},
|
||||
"plenary": {
|
||||
"rev": "74b06c6c75e4eeb3108ec01852001636d85a932b",
|
||||
"src": "https://github.com/nvim-lua/plenary.nvim"
|
||||
},
|
||||
"remember": {
|
||||
"rev": "85aff6dc0a5adab088ef6b9210585ded31c32c7b",
|
||||
"src": "https://github.com/vladdoster/remember.nvim"
|
||||
},
|
||||
"scrolleof": {
|
||||
"rev": "e462b9a07b8166c3e8011f1dcbc6bf68b67cd8d7",
|
||||
"src": "https://github.com/Aasim-A/scrollEOF.nvim"
|
||||
},
|
||||
"telescope": {
|
||||
"rev": "471eebb1037899fd942cc0f52c012f8773505da1",
|
||||
"src": "https://github.com/nvim-telescope/telescope.nvim"
|
||||
},
|
||||
"telescope-file-browser": {
|
||||
"rev": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e",
|
||||
"src": "https://github.com/nvim-telescope/telescope-file-browser.nvim"
|
||||
},
|
||||
"telescope-fzf": {
|
||||
"rev": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c",
|
||||
"src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
|
||||
},
|
||||
"telescope-nerdy": {
|
||||
"rev": "97b0914dece80204a777f04c94b9980da0f7ac88",
|
||||
"src": "https://github.com/2kabhishek/nerdy.nvim"
|
||||
},
|
||||
"telescope-symbols": {
|
||||
"rev": "a6d0127a53d39b9fc2af75bd169d288166118aec",
|
||||
"src": "https://github.com/nvim-telescope/telescope-symbols.nvim"
|
||||
},
|
||||
"telescope-ui-select": {
|
||||
"rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2",
|
||||
"src": "https://github.com/nvim-telescope/telescope-ui-select.nvim"
|
||||
},
|
||||
"treesitter": {
|
||||
"rev": "4916d6592ede8c07973490d9322f187e07dfefac",
|
||||
"src": "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
"vimade": {
|
||||
"rev": "9b2eacd9c97c0bb547f6f3a27e8b5b7a70ad4d03",
|
||||
"src": "https://github.com/tadaa/vimade"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user