Compare commits

...

42 Commits

Author SHA1 Message Date
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
68a7427e80 changed flake.nix 2026-03-05 11:11:10 +00:00
7a05a15b29 made hidden files appear in live grep 2026-03-01 13:14:52 +00:00
ac6d7e8b07 cleaned up new autocommand 2026-02-27 16:44:58 +00:00
93c0eb4679 added git notification 2026-02-27 15:24:51 +00:00
679201030a flake.loxk 2026-02-26 22:22:00 +00:00
7e0dee57fa added flake.nix 2026-02-26 22:19:55 +00:00
d611081d65 changed a load of shit 2026-02-22 16:30:46 +00:00
4f87617051 added inline snacks latex rendering for norg 2026-02-20 15:12:27 +00:00
c43cfedb3b added symbol inserter 2026-02-19 12:20:47 +00:00
de48076947 lots of nonsense, neorg and autosave now in a usable state 2026-02-17 17:15:37 +00:00
eee5b39eb1 i need to get a job wtf even are these changes 2026-02-16 09:35:17 +00:00
83e835bf41 lots of polishing and command mode works again 2026-02-14 13:59:36 +00:00
ea9e351c83 got carried away and now have noice (also neorg works great, theres some shit with python idk 2026-02-13 22:25:54 +00:00
ac4759406c omg neorg works nowww 2026-02-13 20:13:08 +00:00
7f6429312c changed some stuff, still not working :( 2026-02-13 15:25:19 +00:00
voidarclabs
2a39dd7c15 treesitter not working :( 2026-02-12 22:29:48 +00:00
voidarclabs
3833828409 replaced auto-session with mini.session 2026-02-12 11:48:21 +00:00
voidarclabs
ed4b90be18 test 2026-02-12 10:04:55 +00:00
voidarclabs
fccf2bdbae disabled line wrapping 2026-02-08 22:11:54 +00:00
voidarclabs
9d65fdc908 made symlinked files show up in telescope file picker 2026-01-04 19:30:52 +00:00
voidarclabs
e563553a57 added nix formatting 2026-01-04 16:46:53 +00:00
voidarclabs
c1a605ef20 fixed lazydev 2025-11-25 11:46:29 +00:00
voidarclabs
6e88ad861f added nixd 2025-11-22 21:27:16 +00:00
voidarclabs
f24a1029aa major improvements, better stuff overall 2025-11-22 21:22:44 +00:00
voidarclabs
189ba01b97 lsp fix maybe 2025-11-22 17:44:57 +00:00
voidarclabs
24c0f370d0 better scrolloff management 2025-11-04 19:05:15 +00:00
voidarclabs
36a5a0a2c7 fixed C-u and C-d behaviour 2025-11-03 14:15:49 +00:00
voidarclabs
2574ea9578 actual progress omg 2025-10-19 16:42:42 +01:00
voidarclabs
85676d4153 restructure and more plugins 2025-08-22 13:37:35 +01:00
voidarclabs
7afd0cc72f basic theme, mini and completion tools. config still needed 2025-08-21 20:45:04 +01:00
voidarclabs
7f0f2b93f6 fresh start (finally) 2025-08-21 19:15:38 +01:00
17 changed files with 156 additions and 427 deletions

1
.gitignore vendored
View File

@@ -1 +1,2 @@
lazy-lock.json
.session

27
flake.lock generated Normal file
View 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
}

91
flake.nix Normal file
View File

@@ -0,0 +1,91 @@
{
description = "Neovim with LSP dev shell";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
};
outputs =
{ self, nixpkgs }:
let
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
prettier
black
nixfmt
rustfmt
nil
python313Packages.python-lsp-server
typescript-language-server
tailwindcss-language-server
stylua
nixd
# other tools
lua5_1
tree-sitter
ripgrep
gcc
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 {
name = "nvim-with-lsp";
paths = [ pkgs.neovim ];
buildInputs = [ pkgs.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/nvim \
--prefix PATH : ${pkgs.lib.makeBinPath pkgList} \
--set TREE_SITTER_LIB_PATH "${pkgs.tree-sitter}/lib"
'';
};
in
{
packages.${system}.default = nvim-wrapped;
devShells.${system}.default = pkgs.mkShell {
packages = [
nvim-wrapped
];
shellHook = ''
export TREE_SITTER_LIB_PATH="${pkgs.tree-sitter}/lib"
echo "Neovim LSP environment loaded"
export DEVSHELL_NAME="󱄅 flake/#89dceb"
'';
};
};
}

View File

@@ -1,49 +1,45 @@
vim.g.mapleader = "<Space>"
require("config.lazy")
vim.opt.splitbelow = true
require("plugins.init")
-- Colorcheme
vim.cmd.colorscheme("catppuccin-mocha")
vim.opt.splitright = true
-- Line numbers
vim.opt.cursorline = true
vim.wo.relativenumber = true
vim.wo.number = true
vim.api.nvim_set_hl(0, "LineNr", { fg = "#6c7086" }) -- overlay0
vim.api.nvim_set_hl(0, "CursorLineNr", { fg = "#cba6f7", bold = true }) -- mauve
vim.keymap.set("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')
vim.keymap.set("n", "<right>", '<cmd>echo "Use l to move!!"<CR>')
vim.keymap.set("n", "<up>", '<cmd>echo "Use k to move!!"<CR>')
vim.keymap.set("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
-- Windows
vim.opt.splitbelow = true
vim.opt.splitright = true
vim.o.winborder = "rounded"
vim.keymap.set("n", "<leader>w", "<C-w>")
vim.keymap.set("n", "<leader>wd", "<cmd>lua Snacks.dashboard()<CR>")
vim.keymap.set("n", "<leader>l", "<cmd>bnext<CR>")
vim.keymap.set("n", "<leader>h", "<cmd>bprev<CR>")
vim.keymap.set("n", "<leader>j", "<cmd>lua MiniFiles.open()<CR>")
vim.keymap.set("n", "<leader>f", "<cmd>Pick files<cr>")
vim.keymap.set("n", "<leader>g", "<cmd>Pick grep_live<cr>")
vim.keymap.set("n", "<leader>u", "<cmd>UndotreeToggle<cr><cmd>UndotreeFocus<cr>")
vim.keymap.set("n", "<leader>k", "<cmd>lua Snacks.lazygit()<CR>")
vim.keymap.set("n", "<leader>x", "<cmd>FloatermKill<CR>")
vim.keymap.set("i", "jj", "<Esc>")
vim.opt.tabstop = 4
vim.opt.softtabstop = 4
vim.opt.shiftwidth = 4
vim.opt.expandtab = true
-- Sane tab management
vim.opt.tabstop = 2
vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2
vim.opt.expandtab = false
-- Undo management
vim.opt.swapfile = false
vim.opt.backup = false
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
vim.opt.undofile = true
-- Better Highlighting
vim.opt.hlsearch = false
vim.opt.incsearch = true
require("leap").set_default_mappings()
-- Nowrap
vim.opt.wrap = false
-- Scrolloff
vim.opt.scrolloff = math.floor(vim.o.lines / 2) - 3
-- Indent
vim.o.autoindent = true
-- Undotree
vim.cmd("packadd nvim.undotree")
vim.keymap.set("n", "<leader>u", require("undotree").open)

View File

@@ -1,35 +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" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.
install = { colorscheme = { "catppuccin-mocha" } },
-- automatically check for plugin updates
checker = { enabled = true },
})

View File

@@ -1,5 +0,0 @@
return {
{ "catppuccin/nvim", name = "catppuccin", priority = 1000, opts = {
transparent_background = true,
} },
}

View File

@@ -1,137 +0,0 @@
return {
-- LSP Configuration
{
"neovim/nvim-lspconfig",
dependencies = {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
},
config = function()
require("mason").setup()
require("mason-lspconfig").setup({
ensure_installed = { "ts_ls", "lua_ls", "pyright", "rust_analyzer", "eslint" }, -- Add your desired LSPs
automatic_installation = true,
})
local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup({})
--Enable (broadcasting) snippet capability for completion
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
vim.lsp.config("cssls", {
capabilities = capabilities,
})
lspconfig.pyright.setup({})
lspconfig.cssls.setup({})
lspconfig.ts_ls.setup({
capabilities = capabilities,
})
lspconfig.rust_analyzer.setup({})
lspconfig.emmet_ls.setup({
capabilities = require("cmp_nvim_lsp").default_capabilities(),
filetypes = { "html", "css", "javascriptreact", "typescriptreact" }, -- Add more if needed
init_options = {
html = {
options = {
["bem.enabled"] = true,
},
},
},
})
end,
},
-- Autocompletion
{
"hrsh7th/nvim-cmp",
dependencies = {
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"hrsh7th/cmp-cmdline",
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip", -- Completion for snippets
},
config = function()
local cmp = require("cmp")
local luasnip = require("luasnip")
cmp.setup({
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
},
mapping = cmp.mapping.preset.insert({
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { "i", "s" }),
["<CR>"] = cmp.mapping.confirm({ select = true }), -- Confirm selection with Enter
}),
sources = cmp.config.sources({
{ name = "nvim_lsp" }, -- This should provide LSP completions like for ESLint
-- { name = "luasnip" },
{ name = "buffer" },
{ name = "path" },
}),
})
end,
},
-- Linting
{
"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" },
}
-- 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,
},
-- autoformatting
{
"stevearc/conform.nvim",
config = function()
require("conform").setup({
formatters_by_ft = {
lua = { "stylua" },
javascript = { "prettier" },
python = { "black" },
},
format_on_save = true,
})
end,
},
}

View File

@@ -1,3 +0,0 @@
return {
"ggandor/leap.nvim",
}

View File

@@ -1,60 +0,0 @@
return {
"nvim-lualine/lualine.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
config = function()
require("lualine").setup({
options = {
icons_enabled = true,
theme = "auto",
component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" },
disabled_filetypes = {
statusline = {},
winbar = {},
},
ignore_focus = {},
always_divide_middle = true,
always_show_tabline = true,
globalstatus = false,
refresh = {
statusline = 1000,
tabline = 1000,
winbar = 1000,
refresh_time = 16, -- ~60fps
events = {
"WinEnter",
"BufEnter",
"BufWritePost",
"SessionLoadPost",
"FileChangedShellPost",
"VimResized",
"Filetype",
"CursorMoved",
"CursorMovedI",
"ModeChanged",
},
},
},
sections = {
lualine_a = { "mode" },
lualine_b = { "branch", "diff", "diagnostics" },
lualine_c = { "buffers" },
lualine_x = { "encoding", "fileformat", "filetype" },
lualine_y = { "lsp_status" },
lualine_z = { "location" },
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = { "filename" },
lualine_x = { "location" },
lualine_y = {},
lualine_z = {},
},
tabline = {},
winbar = {},
inactive_winbar = {},
extensions = {},
})
end,
}

View File

@@ -1,57 +0,0 @@
return {
"echasnovski/mini.nvim",
version = "*", -- or a specific tag
config = function()
-- Only load the modules you want
require("mini.animate").setup({
cursor = {
enable = false,
},
})
require("mini.pairs").setup()
require("mini.files").setup()
require("mini.cursorword").setup({
content = {
active = true,
},
})
require("mini.notify").setup()
require("mini.move").setup({
mappings = {
down = "J",
up = "K",
},
})
require("mini.surround").setup({
mappings = {
add = "<leader>sa",
delete = "<leader>sd", -- Delete surrounding
find = "<leader>sf", -- Find surrounding (to the right)
find_left = "<leader>sF", -- Find surrounding (to the left)
highlight = "<leader>sh", -- Highlight surrounding
replace = "<leader>sr", -- Replace surrounding
update_n_lines = "<leader>sn", -- Update `n_lines`
},
})
require("mini.ai").setup({
mappings = {
-- Main textobject prefixes
around = "a",
inside = "i",
-- Next/last variants
-- NOTE: These override built-in LSP selection mappings on Neovim>=0.12
-- Map LSP selection manually to use it (see `:h MiniAi.config`)
around_next = "<leader>an",
inside_next = "<leader>in",
around_last = "<leader>al",
inside_last = "<leader>il",
-- Move cursor to corresponding edge of `a` textobject
goto_left = "<leader>g[",
goto_right = "<leader>g]",
},
})
require("mini.pick").setup({})
end,
}

View File

@@ -1,63 +0,0 @@
return {
"folke/snacks.nvim",
priority = 1000,
lazy = false,
---@type snacks.Config
opts = {
lazygit = { enabled = true },
bigfile = { enabled = true },
picker = {},
dashboard = {
enabled = true,
width = 100,
preset = {
keys = {
{ icon = "", key = "f", desc = "Find File", action = ":Pick files" },
{ icon = "", key = "n", desc = "New File", action = ":ene | startinsert" },
{
icon = "",
key = "g",
desc = "Find Text",
action = ":Pick live_grep",
},
{
icon = "",
key = "r",
desc = "Recent Files",
action = ":lua Snacks.dashboard.pick('oldfiles')",
},
{
icon = "",
key = "c",
desc = "Config",
action = ":lua Snacks.dashboard.pick('files', {cwd = vim.fn.stdpath('config')})",
},
{ icon = "", key = "U", desc = "Restore Session", section = "session" },
{
icon = "󰒲 ",
key = "L",
desc = "Lazy",
action = ":Lazy",
enabled = package.loaded.lazy ~= nil,
},
{ icon = "", key = "q", desc = "Quit", action = ":qa" },
},
header = [[
░ ░░░░ ░░░ ░░░ ░░ ░░░░ ░░░ ░░░░ ░░
▒ ▒▒▒▒ ▒▒ ▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒ ▒▒ ▒▒▒▒ ▒▒ ▒▒▒▒ ▒▒ ▒▒▒▒ ▒
▓▓ ▓▓ ▓▓▓ ▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓▓ ▓▓▓▓ ▓▓ ▓▓▓▓ ▓▓ ▓▓▓ ▓▓▓▓▓▓▓
███ ████ ████ █████ █████ ████ ██ ██ ███ ███ ████ █
████ ██████ ███ ██ ███ ████ ██ ████ ███ ██
]],
},
sections = {
{ section = "header" },
{ icon = "", title = "Keymaps", section = "keys", indent = 2, padding = 1 },
{ icon = "", title = "Recent Files", section = "recent_files", indent = 2, padding = 1 },
{ icon = "", title = "Projects", section = "projects", indent = 2, padding = 1 },
{ section = "startup" },
},
},
},
}

View File

@@ -1,8 +0,0 @@
return {
{
"levouh/tint.nvim",
config = function()
require("tint").setup()
end,
},
}

View File

@@ -1,13 +0,0 @@
return {
{
"akinsho/toggleterm.nvim",
version = "*",
opts = {--[[ things you want to change go here]]
},
config = function()
require("toggleterm").setup({
open_mapping = [[<c-\>]],
})
end,
},
}

View File

@@ -1,12 +0,0 @@
return {
"nvim-treesitter/nvim-treesitter",
run = ":TSUpdate",
config = function()
require("nvim-treesitter.configs").setup({
ensure_installed = { "javascript", "lua", "python", "html", "css", "typescript", "rust" }, -- Add JavaScript here
highlight = {
enable = true, -- Enable syntax highlighting
},
})
end,
}

View File

@@ -1,4 +0,0 @@
return {
"mbbill/undotree",
lazy = false,
}

1
plugins/init.lua Normal file
View File

@@ -0,0 +1 @@
require("plugins.ui.catppuccin")

10
plugins/ui/catppuccin.lua Normal file
View File

@@ -0,0 +1,10 @@
vim.pack.add({ { src = "https://github.com/catppuccin/nvim", name = "catppuccin" } })
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
})