Compare commits

..

29 Commits

Author SHA1 Message Date
4751798619 fixed blink dependancy and removed unused plugins 2026-05-12 10:39:25 +01:00
677d978932 made tabs better to use in general, telescope buffer picker navigates to open pane 2026-05-08 17:59:12 +01:00
1b887d67bc scrolloff needs to be set before scrolleof initialises 2026-05-06 13:53:08 +01:00
188b15d360 added typescript 2026-05-04 18:56:46 +01:00
2e4e260731 added svelte linting 2026-05-04 14:28:22 +01:00
67ef68769a fixed svelte highlighting 2026-05-03 20:13:58 +01:00
85b26f78b1 added svelte lsp 2026-05-03 19:59:47 +01:00
09f5dd3037 changed some treesitter nonsense 2026-05-03 19:58:07 +01:00
169c146b1f changed some nonsense, will see if works 2026-05-03 18:07:14 +01:00
98c809990b fixed scrolloff for real this time, but no more scrolleof :( 2026-05-02 10:46:21 +01:00
f5fb5c83d8 fixed scrolloff, scrolleof not working 2026-04-30 10:03:37 +01:00
dc5b162d20 updated flake 2026-04-17 23:09:57 +01:00
8786a18cd1 added definition bind 2026-04-17 23:09:05 +01:00
2b0b099f5e all functionality restored, switching to vim.pack 2026-04-16 10:03:17 +01:00
e2555ad8d0 fixed mini sessions and added telescope 2026-04-16 10:00:14 +01:00
ac461d7a6c made lazydev load only when in a lua file 2026-04-16 09:59:52 +01:00
b76db809f2 added a load of nonsense and fixed the flake 2026-04-10 20:55:51 +01:00
6f7793bde4 almost everything 2026-04-10 15:27:58 +01:00
624fefdd18 an attempt was made 2026-04-10 12:15:22 +01:00
761f890b10 blank slate 2026-04-09 20:35:13 +01:00
cfc5baa8ad less of a rewrite, more of a restructure 2026-04-07 14:06:49 +01:00
7eae05c8e2 added zsh 2026-04-02 10:49:14 +01:00
5720ab20dc updated flake and some other stuff 2026-04-02 10:47:43 +01:00
3a71912e22 added A to list of shit that indents properly 2026-03-31 09:59:15 +01:00
f5b4ee85a4 added rust nonsense 2026-03-30 11:21:24 +01:00
9e02247d65 fixed weird background on code blocks in neorg 2026-03-29 14:40:26 +01:00
1d69673e62 added scrolloff for end of file and blogging stuff 2026-03-22 11:37:00 +00:00
570ab4dc51 added macro indicator to lualine 2026-03-21 11:28:10 +00:00
86752af3e9 added css formatting 2026-03-20 21:45:55 +00:00
32 changed files with 803 additions and 829 deletions

6
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771848320, "lastModified": 1777578337,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993", "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -11,14 +11,17 @@
system = "x86_64-linux"; # change if needed system = "x86_64-linux"; # change if needed
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
pkgList = with pkgs; [ pkgList = with pkgs; [
# LSPs # LSPs
lua-language-server lua-language-server
vscode-langservers-extracted vscode-langservers-extracted
emmet-ls emmet-language-server
svelte-language-server
rust-analyzer
ast-grep
prettier prettier
black black
nixfmt nixfmt
rustfmt
nil nil
python313Packages.python-lsp-server python313Packages.python-lsp-server
typescript-language-server typescript-language-server
@@ -31,32 +34,10 @@
tree-sitter tree-sitter
ripgrep ripgrep
gcc gcc
fzf
gnumake gnumake
imagemagick imagemagick
luajitPackages.magick
ghostscript
luarocks 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 { nvim-wrapped = pkgs.symlinkJoin {
@@ -82,6 +63,7 @@
shellHook = '' shellHook = ''
export TREE_SITTER_LIB_PATH="${pkgs.tree-sitter}/lib" export TREE_SITTER_LIB_PATH="${pkgs.tree-sitter}/lib"
echo "Neovim LSP environment loaded" echo "Neovim LSP environment loaded"
export DEVSHELL_NAME="󱄅 flake/#89dceb"
''; '';
}; };
}; };

116
init.lua
View File

@@ -1,9 +1,16 @@
-- Set mapleader vim.g.mapleader = " "
vim.g.mapleader = "<Space>"
vim.g.maplocalleader = "," vim.g.maplocalleader = ","
-- Lazy -- Scrolloff
require("config.lazy") local scrolloff = math.floor(vim.o.lines / 2) - 3
vim.opt.scrolloff = scrolloff
require("plugins.init")
require("config.autocmd")
require("config.binds")
-- Colorcheme
vim.cmd.colorscheme("catppuccin-mocha")
-- Line numbers -- Line numbers
vim.opt.cursorline = true vim.opt.cursorline = true
@@ -12,22 +19,6 @@ vim.wo.number = true
vim.api.nvim_set_hl(0, "LineNr", { fg = "#6c7086" }) -- overlay0 vim.api.nvim_set_hl(0, "LineNr", { fg = "#6c7086" }) -- overlay0
vim.api.nvim_set_hl(0, "CursorLineNr", { fg = "#cba6f7", bold = true }) -- mauve vim.api.nvim_set_hl(0, "CursorLineNr", { fg = "#cba6f7", bold = true }) -- mauve
local cursorline_group = vim.api.nvim_create_augroup("CursorLineControl", { clear = true })
vim.api.nvim_create_autocmd({ "WinEnter", "BufEnter" }, {
group = cursorline_group,
callback = function()
vim.opt_local.cursorline = true
end,
})
vim.api.nvim_create_autocmd({ "WinLeave" }, {
group = cursorline_group,
callback = function()
vim.opt_local.cursorline = false
end,
})
-- Windows -- Windows
vim.opt.splitbelow = true vim.opt.splitbelow = true
vim.opt.splitright = true vim.opt.splitright = true
@@ -52,88 +43,9 @@ vim.opt.incsearch = true
-- Nowrap -- Nowrap
vim.opt.wrap = false vim.opt.wrap = false
-- Colorcheme
vim.cmd.colorscheme("catppuccin-mocha")
-- Scrolloff
vim.opt.scrolloff = math.floor(vim.o.lines / 2) - 3
-- Indent -- Indent
vim.o.autoindent = true vim.o.autoindent = true
-- Keymap function -- Undotree
function Keymap(mode, key, binding) vim.cmd("packadd nvim.undotree")
vim.keymap.set(mode, key, binding, { noremap = true, silent = true }) vim.keymap.set("n", "<leader>u", require("undotree").open)
end
-- Better keymaps
Keymap("i", "jj", "<Esc>")
Keymap("n", "q:", ":")
Keymap("n", "<leader>bd", function() -- delete buffer
vim.cmd("bd")
vim.cmd("echo 'Buffer deleted'")
end)
vim.keymap.set("n", "i", function()
if vim.fn.getline("."):match("^%s*$") then
return [["_cc]]
else
return "i"
end
end, { expr = true, desc = "Inent properly on empty lines" })
vim.keymap.set("n", "a", function()
if vim.fn.getline("."):match("^%s*$") then
return [["_cc]]
else
return "a"
end
end, { expr = true, desc = "Indent properly on empty lines" })
-- C-BS for deleting whole word in insert mode
vim.keymap.set("i", "<C-BS>", "<C-W>", { noremap = true })
-- Keybinds for MiniSessions
vim.keymap.set("n", "<leader>qj", function() -- quit and save session local
MiniSessions.write(".session")
vim.cmd("wqa")
end, { noremap = true })
vim.keymap.set("n", "<leader>qd", function() -- quit and delete session
pcall(MiniSessions.delete(".session"))
vim.cmd("wqa")
end, { noremap = true })
-- lg keybind
Keymap("n", "<leader>l", function()
Snacks.lazygit.open()
end)
-- Autocommand to check git status
vim.api.nvim_create_autocmd("VimEnter", {
callback = function()
-- Verify if the current directory is a git repo
local is_git = os.execute("git rev-parse --is-inside-work-tree > /dev/null 2>&1")
if is_git ~= 0 then
return
end
-- Perform an async fetch to avoid startup lag
vim.fn.jobstart("git fetch", {
on_exit = function()
-- Get the number of commits the remote is ahead of local HEAD
local count = vim.fn.system("git rev-list --count HEAD..@{u} 2>/dev/null"):gsub("%s+", "")
if count ~= "" and tonumber(count) > 0 then
vim.schedule(function()
vim.notify(
"󰊢 " .. count .. " new commit(s) available on remote.",
vim.log.levels.INFO,
{ title = "Git Status", icon = "󰊢" }
)
end)
end
end,
})
end,
})

82
lua/config/autocmd.lua Normal file
View File

@@ -0,0 +1,82 @@
-- Autocommand to check git status
vim.api.nvim_create_autocmd("VimEnter", {
callback = function()
-- Verify if the current directory is a git repo
local is_git = os.execute("git rev-parse --is-inside-work-tree > /dev/null 2>&1")
if is_git ~= 0 then
return
end
-- Perform an async fetch to avoid startup lag
vim.fn.jobstart("git fetch", {
on_exit = function()
-- Get the number of commits the remote is ahead of local HEAD
local count = vim.fn.system("git rev-list --count HEAD..@{u} 2>/dev/null"):gsub("%s+", "")
if count ~= "" and tonumber(count) > 0 then
vim.schedule(function()
vim.notify(
"󰊢 " .. count .. " new commit(s) available on remote.",
vim.log.levels.INFO,
{ title = "Git Status", icon = "󰊢" }
)
end)
end
end,
})
end,
})
vim.api.nvim_create_autocmd("FileType", {
pattern = { "svelte" },
callback = function()
vim.treesitter.start()
end,
})
local cursorline_group = vim.api.nvim_create_augroup("CursorLineControl", { clear = true })
vim.api.nvim_create_autocmd({ "WinEnter", "BufEnter" }, {
group = cursorline_group,
callback = function()
vim.opt_local.cursorline = true
end,
})
vim.api.nvim_create_autocmd({ "WinLeave" }, {
group = cursorline_group,
callback = function()
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,
})

104
lua/config/binds.lua Normal file
View File

@@ -0,0 +1,104 @@
-- Keymap function
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
Keymap("n", "<leader>bd", function() -- delete buffer
vim.cmd("bd")
vim.cmd("echo 'Buffer deleted'")
end)
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, { expr = true })
end
Keymap("i", "<C-BS>", "<C-W>") -- C-Backscpace for whole words
Keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>") -- Diagnostics for Linter
Keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<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)
-- 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({ show_all_buffers = true })
end)
-- Tab binds
Keymap("n", "<C-T>l", function()
vim.cmd("tabnext")
end)
Keymap("n", "<C-T>h", function()
vim.cmd("tabprevious")
end)
Keymap("n", "<C-T>j", function()
vim.cmd("tabnew")
end)
Keymap("n", "<C-T>q", function()
vim.cmd("tabclose")
end)

View File

@@ -1,41 +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 = " "
-- Setup lazy.nvim
require("lazy").setup({
spec = {
-- import your plugins
{ import = "plugins" },
{ import = "plugins.completion" },
{ import = "plugins.ui" },
{ import = "plugins.functional" },
{ import = "plugins.functional.neorg" },
},
-- 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 },
})

View File

@@ -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,
},
},
},
},
}

View File

@@ -1,15 +1,51 @@
return { vim.pack.add({
"stevearc/conform.nvim", { src = "https://github.com/stevearc/conform.nvim", name = "conform" },
config = function() { src = "https://github.com/mfussenegger/nvim-lint", name = "lint" },
})
require("conform").setup({ require("conform").setup({
formatters_by_ft = { formatters_by_ft = {
lua = { "stylua" }, lua = { "stylua" },
javascript = { "prettier" }, javascript = { "prettier" },
typescript = { "prettier" },
html = { "prettier" },
svelte = { "prettier" },
python = { "black" }, python = { "black" },
nix = { "nixfmt" }, nix = { "nixfmt" },
css = { "prettier" },
rust = { "rustfmt" },
}, },
format_on_save = true, format_on_save = true,
undojoin = 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,
})

View File

@@ -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" } },
},
},
}

View File

@@ -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,
}

View File

@@ -1,6 +1,9 @@
return { vim.pack.add({
"neovim/nvim-lspconfig", { src = "https://github.com/neovim/nvim-lspconfig", name = "lspconfig" },
config = function() { src = "https://github.com/saghen/blink.cmp", name = "blink" },
{ src = "https://github.com/saghen/blink.lib", name = "blink-lib" },
})
vim.lsp.config("lua_ls", { vim.lsp.config("lua_ls", {
settings = { settings = {
Lua = { Lua = {
@@ -15,25 +18,95 @@ return {
}, },
}, },
}) })
vim.lsp.config("emmet_ls", { -- vim.lsp.config("emmet_language_server", {
-- capabilities = require("cmp_nvim_lsp").default_capabilities(), -- -- capabilities = require("cmp_nvim_lsp").default_capabilities(),
filetypes = { "html", "css", "javascriptreact", "typescriptreact" }, -- filetypes = { "html", "css", "javascriptreact", "typescriptreact" },
init_options = { -- init_options = {
html = { -- preferences = {},
options = { -- show_expanded_abbreviation = "always",
["bem.enabled"] = true, -- show_abbreviation_suggestions = true,
}, -- show_suggestions_as_snippets = true,
}, -- html = {
}, -- options = {
}) -- ["bem.enabled"] = true,
-- ["output.selfClosingStyle"] = "xhtml",
-- },
-- },
-- },
-- })
vim.lsp.enable({ vim.lsp.enable({
"lua_ls", "lua_ls",
"ts_ls", "ts_ls",
"pylsp", "pylsp",
"cssls", "cssls",
"svelte",
"nixd", "nixd",
"rust_analyzer", "rust_analyzer",
"emmet_ls", "emmet_language_server",
})
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, end,
} })

View File

@@ -1,21 +1,18 @@
return { vim.pack.add({ { src = "https://github.com/nvim-treesitter/nvim-treesitter", name = "treesitter" } })
"nvim-treesitter/nvim-treesitter",
lazy = false, require("nvim-treesitter").setup({
branch = "master",
build = ":TSUpdate",
config = function()
require("nvim-treesitter.configs").setup({
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true },
ensure_installed = { })
require("nvim-treesitter").install({
"bash", "bash",
"html", "html",
"svelte",
"latex", "latex",
"javascript", "javascript",
"json", "json",
"lua", "lua",
"norg",
"norg_meta",
"markdown", "markdown",
"markdown_inline", "markdown_inline",
"query", "query",
@@ -25,7 +22,4 @@ return {
"python", "python",
"vim", "vim",
"yaml", "yaml",
},
}) })
end,
}

View File

@@ -1,47 +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,
}

View File

@@ -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",
},
},
}

View File

@@ -1,73 +0,0 @@
return {
"echasnovski/mini.nvim",
version = "",
config = function()
require("mini.pairs").setup() -- Bracket pairs and stuff
require("mini.ai").setup() -- Around and In extension for visual mode
require("mini.cursorword").setup() -- Underline current word below cursor (makes it easier to c and d)
require("mini.indentscope").setup({ -- shows indents
symbol = "",
draw = {
delay = 10,
animation = require("mini.indentscope").gen_animation.linear({
duration = 15,
unit = "step",
easing = "out",
}),
},
})
require("mini.trailspace").setup() -- Shows useless spaces
require("mini.sessions").setup({ -- dir based session management
autoread = true,
autowrite = true,
file = ".session",
force = { read = false, write = true, delete = true },
})
require("mini.surround").setup() -- Suround selections with characters
require("mini.move").setup({ -- move selection in visual mode
mappings = {
down = "J",
up = "K",
},
})
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,
}

View File

@@ -1,80 +0,0 @@
return {
"nvim-neorg/neorg",
lazy = false,
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",
},
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 })
end,
})
end,
}

View File

@@ -1,9 +0,0 @@
return {
'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)
},
}

View File

@@ -1,6 +0,0 @@
return {
"vladdoster/remember.nvim",
config = function()
require("remember").setup({})
end,
}

View File

@@ -1,4 +0,0 @@
return {
"nvim-telescope/telescope-file-browser.nvim",
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
}

View File

@@ -1,68 +0,0 @@
return {
"nvim-telescope/telescope.nvim",
tag = "0.1.8",
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()
require("telescope").setup({
defaults = {
file_ignore_patterns = { ".git", ".venv", ".node_modules" },
},
pickers = {
live_grep = {
additional_args = function(opts)
return { "--hidden" }
end,
},
},
extensions = {
file_browser = {
theme = "ivy",
hijack_netrw = true,
},
["ui-select"] = {
require("telescope.themes").get_dropdown({
-- even more opts
}),
},
},
})
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 dont 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,
}

View File

@@ -1,7 +0,0 @@
return {
"mbbill/undotree",
lazy = false,
config = function()
vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<cr><cmd>UndotreeFocus<cr>")
end,
}

View File

@@ -1 +1,35 @@
return { undefined } 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

View File

@@ -0,0 +1,18 @@
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,
})

View File

@@ -1,12 +0,0 @@
return {
"catppuccin/nvim",
name = "catppuccin",
opts = {
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
}
}

View File

@@ -1,7 +1,9 @@
return { vim.pack.add({
"nvim-lualine/lualine.nvim", { src = "https://github.com/nvim-lualine/lualine.nvim", name = "lualine" },
dependencies = { "nvim-tree/nvim-web-devicons", "archibate/lualine-time" }, { src = "https://github.com/nvim-tree/nvim-web-devicons", name = "devicons" },
config = function() { src = "https://github.com/archibate/lualine-time", name = "lualine-time" },
})
require("lualine").setup({ require("lualine").setup({
options = { options = {
icons_enabled = true, icons_enabled = true,
@@ -36,7 +38,18 @@ return {
}, },
}, },
sections = { sections = {
lualine_a = { "mode" }, lualine_a = {
"mode",
{
function()
local reg = vim.fn.reg_recording()
if reg == "" then
return ""
end -- not recording
return "MACRO " .. string.upper(tostring(reg))
end,
},
},
lualine_b = { "branch", "diff", "diagnostics" }, lualine_b = { "branch", "diff", "diagnostics" },
lualine_c = { "filename" }, lualine_c = { "filename" },
lualine_x = { "filetype" }, lualine_x = { "filetype" },
@@ -56,5 +69,3 @@ return {
inactive_winbar = {}, inactive_winbar = {},
extensions = {}, extensions = {},
}) })
end,
}

View File

@@ -1,7 +1,9 @@
return { vim.pack.add({
"folke/noice.nvim", { src = "https://github.com/folke/noice.nvim", name = "noice" },
event = "VeryLazy", { src = "https://github.com/MunifTanjim/nui.nvim", name = "nui" },
config = function() { src = "https://github.com/rcarriga/nvim-notify", name = "notify" },
})
vim.notify = require("notify").setup({ vim.notify = require("notify").setup({
background_colour = "#000000", background_colour = "#000000",
render = "compact", render = "compact",
@@ -37,10 +39,3 @@ return {
lsp_doc_border = false, -- add a border to hover docs and signature help 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",
},
}

View File

@@ -1,16 +0,0 @@
return {
"folke/snacks.nvim",
config = function()
require("snacks").setup({
bigfile = {},
lazygit = {},
image = {
enabled = true,
math = {
enabled = true,
latex = {},
},
},
})
end,
}

View File

@@ -1,7 +0,0 @@
return {
"tadaa/vimade",
opts = {
recipe = { "minimalist", { animate = true } },
fadelevel = 0.6,
},
}

View File

@@ -0,0 +1,35 @@
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({
-- The pattern used for the internal autocmd to determine
-- where to run scrollEOF. See https://neovim.io/doc/user/autocmd.html#autocmd-pattern
pattern = "*",
-- Whether or not scrollEOF should be enabled in insert mode
insert_mode = false,
-- Whether or not scrollEOF should be enabled in floating windows
floating = true,
-- List of filetypes to disable scrollEOF for.
disabled_filetypes = { "terminal" },
-- List of modes to disable scrollEOF for. see https://neovim.io/doc/user/builtin.html#mode()
disabled_modes = { "t", "nt" },
})

View File

@@ -0,0 +1,52 @@
vim.pack.add({ { src = "https://github.com/echasnovski/mini.nvim", name = "mini" } })
require("mini.pairs").setup() -- Bracket pairs and stuff
require("mini.ai").setup() -- Around and In extension for visual mode
require("mini.cursorword").setup() -- Underline current word below cursor (makes it easier to c and d)
require("mini.indentscope").setup({ -- shows indents
symbol = "",
draw = {
delay = 10,
animation = require("mini.indentscope").gen_animation.linear({
duration = 15,
unit = "step",
easing = "out",
}),
},
})
require("mini.trailspace").setup() -- Shows useless spaces
require("mini.sessions").setup({ -- dir based session management
autoread = true,
autowrite = true,
file = ".session",
force = { read = false, write = true, delete = true },
})
require("mini.surround").setup() -- Suround selections with characters
require("mini.move").setup({ -- move selection in visual mode
mappings = {
down = "J",
up = "K",
},
})
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 }),
},
})

View File

@@ -0,0 +1,49 @@
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" },
})
local actions = require("telescope.actions")
require("telescope").setup({
defaults = {
file_ignore_patterns = { ".git", ".venv", ".node_modules", "node_modules", ".svelte-kit", ".vscode" },
},
pickers = {
buffers = {
show_all_buffers = true,
mappings = {
i = {
["<CR>"] = actions.select_drop,
},
n = {
["<CR>"] = actions.select_drop,
},
},
},
live_grep = {
additional_args = function()
return { "--hidden" }
end,
},
},
extensions = {
file_browser = {
theme = "ivy",
hijack_netrw = true,
},
["ui-select"] = {
require("telescope.themes").get_dropdown({
-- even more opts
}),
},
},
})
require("telescope").load_extension("file_browser")
require("telescope").load_extension("ui-select")
require("telescope").load_extension("nerdy")

112
nvim-pack-lock.json Normal file
View File

@@ -0,0 +1,112 @@
{
"plugins": {
"autosave": {
"rev": "9aabcb8396224dcbf8d51c0c1d620d88a46e89d7",
"src": "https://github.com/okuuva/auto-save.nvim"
},
"blink": {
"rev": "2ef3db111181c5eef22a462aa0122349a6027f28",
"src": "https://github.com/saghen/blink.cmp"
},
"blink-lib": {
"rev": "f29d8bac6549bc1e7d699c83f680823d7def98bd",
"src": "https://github.com/saghen/blink.lib"
},
"catppuccin": {
"rev": "426dbebe06b5c69fd846ceb17b42e12f890aedf1",
"src": "https://github.com/catppuccin/nvim"
},
"conform": {
"rev": "dca1a190aa85f9065979ef35802fb77131911106",
"src": "https://github.com/stevearc/conform.nvim"
},
"devicons": {
"rev": "2795c26c916bb3c57dde308b82be51971fa92747",
"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": "451d4ef9abd4f0f08e379ef0d55d1c391b6125a7",
"src": "https://github.com/neovim/nvim-lspconfig"
},
"lualine": {
"rev": "131a558e13f9f28b15cd235557150ccb23f89286",
"src": "https://github.com/nvim-lualine/lualine.nvim"
},
"lualine-time": {
"rev": "8838875e2e787293bb905d23dbb91ef4bde188ea",
"src": "https://github.com/archibate/lualine-time"
},
"mini": {
"rev": "a5fda91040763cf9ad70bdce1c656b0f4ba1d16e",
"src": "https://github.com/echasnovski/mini.nvim"
},
"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": "f04ab730b8f9c6bf3f54a206d0dcddfd70c52d59",
"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": "b25b749b9db64d375d782094e2b9dce53ad53a40",
"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"
}
}
}