From 97576e96da9b1782d636ed9ced92b9ad1ba72d11 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 2 Jun 2026 18:28:15 +0200 Subject: [PATCH 01/17] add gitignore --- .gitignore | 1 + nvim-pack-lock.json | 57 --------------------------------------------- 2 files changed, 1 insertion(+), 57 deletions(-) create mode 100644 .gitignore delete mode 100644 nvim-pack-lock.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92a49de --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +nvim-pack-lock.json diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json deleted file mode 100644 index fd15508..0000000 --- a/nvim-pack-lock.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "plugins": { - "base16-nvim": { - "rev": "190397833e53fdfd5cf400c5baaf1a4e533158e5", - "src": "https://github.com/RRethy/base16-nvim" - }, - "blink.cmp": { - "rev": "78336bc89ee5365633bcf754d93df01678b5c08f", - "src": "https://github.com/Saghen/blink.cmp", - "version": "'v1'" - }, - "bufferline.nvim": { - "rev": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3", - "src": "https://github.com/akinsho/bufferline.nvim" - }, - "cord.nvim": { - "rev": "283e4a5bdafd0d6187f28e5b739cccab6b4c9c64", - "src": "https://github.com/vyfor/cord.nvim" - }, - "lspsaga.nvim": { - "rev": "562d9724e3869ffd1801c572dd149cc9f8d0cc36", - "src": "https://github.com/nvimdev/lspsaga.nvim" - }, - "lualine.nvim": { - "rev": "47f91c416daef12db467145e16bed5bbfe00add8", - "src": "https://github.com/nvim-lualine/lualine.nvim" - }, - "mason-lspconfig.nvim": { - "rev": "25f609e7fca78af7cede4f9fa3af8a94b1c4950b", - "src": "https://github.com/mason-org/mason-lspconfig.nvim.git" - }, - "mason.nvim": { - "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65", - "src": "https://github.com/mason-org/mason.nvim.git" - }, - "nvim-lspconfig": { - "rev": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763", - "src": "https://github.com/neovim/nvim-lspconfig" - }, - "nvim-treesitter": { - "rev": "c82bf96f0a773d85304feeb695e1e23b2207ac35", - "src": "https://github.com/nvim-treesitter/nvim-treesitter" - }, - "nvim-web-devicons": { - "rev": "40e9d5a6cc3db11b309e39593fc7ac03bb844e38", - "src": "https://github.com/nvim-tree/nvim-web-devicons" - }, - "snacks.nvim": { - "rev": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e", - "src": "https://github.com/folke/snacks.nvim" - }, - "tinted-vim": { - "rev": "19b03f63f58ffc63aa8e26159a370d6514735581", - "src": "https://github.com/tinted-theming/tinted-vim" - } - } -} From 440678afbd4baf000ed789293d78788b7a06b466 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 2 Jun 2026 18:28:52 +0200 Subject: [PATCH 02/17] add luarc to gitignore --- .gitignore | 1 + .luarc.json | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 .luarc.json diff --git a/.gitignore b/.gitignore index 92a49de..d5003b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ nvim-pack-lock.json +.luarc.json diff --git a/.luarc.json b/.luarc.json deleted file mode 100644 index b243cc8..0000000 --- a/.luarc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "diagnostics.globals": [ - "vim", - "Snacks" - ] -} \ No newline at end of file From 24c567c5ed47daf56ee1033d2d5b9fef6e0c4387 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 2 Jun 2026 21:07:56 +0200 Subject: [PATCH 03/17] clean up init.lua and setup first migrations to mini --- init.lua | 112 ++++++++++--------------------------------------------- 1 file changed, 20 insertions(+), 92 deletions(-) diff --git a/init.lua b/init.lua index 1477173..97a4157 100644 --- a/init.lua +++ b/init.lua @@ -1,20 +1,13 @@ --- general options local opt = vim.opt -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" -opt.number = true -opt.relativenumber = true -opt.cursorline = false opt.termguicolors = true -opt.winborder = "rounded" +opt.relativenumber = true opt.signcolumn = "yes" vim.lsp.inlay_hint.enable = true opt.tabstop = 8 vim.opt.expandtab = true vim.g.tinted_background_transparent = 1 opt.swapfile = false -opt.winborder = "single" opt.shiftwidth = 8 vim.diagnostic.config({ @@ -25,99 +18,51 @@ vim.diagnostic.config({ }) -- add plugins vim.pack.add({ - "https://github.com/folke/snacks.nvim", - "https://github.com/nvim-lualine/lualine.nvim", "https://github.com/tinted-theming/tinted-vim", - "https://github.com/nvimdev/lspsaga.nvim", "https://github.com/neovim/nvim-lspconfig", "https://github.com/nvim-treesitter/nvim-treesitter", "https://github.com/vyfor/cord.nvim", - "https://github.com/mason-org/mason-lspconfig.nvim.git", - "https://github.com/mason-org/mason.nvim.git", - "https://github.com/Saghen/blink.cmp", - "https://github.com/saghen/blink.lib", + "https://github.com/nvim-mini/mini.nvim" }) +-- setup mini +require('mini.basics').setup() +require('mini.icons').setup() +require('mini.pick').setup() + -- function to set colorsceme vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme")) --- setup superior (?) lsp + +-- setup superior lsp vim.lsp.config("qml-language-server", { - cmd = { "qml-language-server" }, - filetypes = { "qml" }, - root_markers = { { "qmldir", "shell.qml" }, ".git" }, + cmd = { "qml-language-server" }, + filetypes = { "qml" }, + root_markers = { { "qmldir", "shell.qml" }, ".git" }, +}) +vim.lsp.config("lua-language-server", { + cmd = { "lua-language-server" }, + filetypes = { "lua" }, + root_markers = { { ".luarc.json" }, ".git" }, }) vim.lsp.enable("qml-language-server") vim.lsp.enable("clangd") -require("blink.cmp").setup({ - fuzzy = { implementation = "prefer_rust_with_warning" }, - completion = { - menu = { - auto_show = false, - }, - }, - sources = { - default = { "lsp", "path", "snippets", "buffer" }, - }, -}) -require("mason").setup() -require("mason-lspconfig").setup() -require("snacks").setup({ - notifier = { enabled = true }, - statuscolumn = { enabled = true }, - picker = {}, -}) -require("lspsaga").setup({ - symbol_in_winbar = { enable = true }, - lightbulb = { - enable = true, - sign = false, - }, - hover = { - max_width = 0.6, - open_link = "gx", - open_browser = "!google-chrome", - }, -}) +vim.lsp.enable("lua-language-server") require("cord").setup({ display = { theme = "atom", }, editor = { tooltip = "ur gay x3" }, }) -require("lualine").setup({ - options = { - section_separators = { left = "", right = "" }, - component_separators = { left = "|", right = "|" }, - globalstatus = true, - always_divide_middle = true, - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "diagnostics" }, - lualine_c = { "filename", "filesize", }, - lualine_x = { "lsp_status", "filetype" }, - lualine_y = { "" }, - lualine_z = { "location" }, - }, - tabline = { - lualine_a = { { 'buffers', mode = 2, show_modified_status = true, } }, - lualine_b = { 'branch' }, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { 'tabs' } - } -}) -- keymaps local map = vim.keymap.set map("n", "ff", function() - Snacks.picker.files() + MiniPick.builtin.files() end) map("n", "lg", function() - Snacks.picker.grep() + MiniPick.builtin.grep_live() end) map("n", "", "h") @@ -129,29 +74,12 @@ map("n", "", ":vertical resize +5", { silent = true }) map("n", "", ":resize +5", { silent = true }) map("n", "", ":resize -5", { silent = true }) -- lsp keybinds -map("n", "K", " Lspsaga hover_doc") -map("n", "go", " Lspsaga goto_definition") -map("n", "gr", " Lspsaga finder") -map("n", "qf", " Lspsaga code_action") map("n", "", function() vim.lsp.buf.format() end) --- buffer keybinds -map("n", "", " LualineBuffersJump! 1 ") -map("n", "", " LualineBuffersJump! 2 ") -map("n", "", " LualineBuffersJump! 3 ") -map("n", "", " LualineBuffersJump! 4 ") -map("n", "", " LualineBuffersJump! 5 ") -map("n", "", " LualineBuffersJump! 6 ") -map("n", "", " LualineBuffersJump! 7 ") -map("n", "", " LualineBuffersJump! 8 ") -map("n", "", " LualineBuffersJump! 9 ") -map("n", "", " LualineBuffersJump! last ") -map("n", "w", " bdelete! ") -- util keybinds map("n", "t", " terminal ") map("n", "", "Lspsaga term_toggle") map("t", "", "") map("i", "", vim.lsp.completion.get, { desc = "trigger autocompletion" }) - From 19076813f3536a64986534e3ffb503eebb645d81 Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 3 Jun 2026 00:21:02 +0200 Subject: [PATCH 04/17] fix lua ls --- init.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/init.lua b/init.lua index 97a4157..e3226e1 100644 --- a/init.lua +++ b/init.lua @@ -38,11 +38,7 @@ vim.lsp.config("qml-language-server", { filetypes = { "qml" }, root_markers = { { "qmldir", "shell.qml" }, ".git" }, }) -vim.lsp.config("lua-language-server", { - cmd = { "lua-language-server" }, - filetypes = { "lua" }, - root_markers = { { ".luarc.json" }, ".git" }, -}) +vim.lsp.enable("lua_ls") vim.lsp.enable("qml-language-server") vim.lsp.enable("clangd") From 98bb9ad4d4f41cf33269312188073f3cd3a62bdd Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 4 Jun 2026 13:37:53 +0200 Subject: [PATCH 05/17] replace stuff with mini equivalent and move to tinted-nvim --- init.lua | 67 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index e3226e1..cd930a1 100644 --- a/init.lua +++ b/init.lua @@ -1,14 +1,9 @@ local opt = vim.opt - -opt.termguicolors = true opt.relativenumber = true -opt.signcolumn = "yes" vim.lsp.inlay_hint.enable = true opt.tabstop = 8 vim.opt.expandtab = true -vim.g.tinted_background_transparent = 1 opt.swapfile = false - opt.shiftwidth = 8 vim.diagnostic.config({ virtual_text = { @@ -18,20 +13,72 @@ vim.diagnostic.config({ }) -- add plugins vim.pack.add({ - "https://github.com/tinted-theming/tinted-vim", + "https://github.com/tinted-theming/tinted-nvim.git", "https://github.com/neovim/nvim-lspconfig", - "https://github.com/nvim-treesitter/nvim-treesitter", "https://github.com/vyfor/cord.nvim", "https://github.com/nvim-mini/mini.nvim" }) +-- function to set colorsceme +require('tinted-nvim').setup({ + ui = { + transparent = true + }, + highlights = { + overrides = function(palette) + return { + MiniStatuslineModeNormal = { fg = palette.base00, bg = palette.base0D, bold = true }, + MiniStatuslineModeInsert = { fg = palette.base00, bg = palette.base0B, bold = true }, + MiniStatuslineModeVisual = { fg = palette.base00, bg = palette.base0E, bold = true }, + MiniStatuslineModeReplace = { fg = palette.base00, bg = palette.base08, bold = true }, + MiniStatuslineModeCommand = { fg = palette.base00, bg = palette.base0A, bold = true }, + MiniStatuslineModeOther = { fg = palette.base00, bg = palette.base0C, bold = true }, + MiniStatuslineDevinfo = { fg = palette.base05, bg = palette.base02 }, + MiniStatuslineFilename = { fg = palette.base04, bg = palette.base01 }, + MiniStatuslineFileinfo = { fg = palette.base05, bg = palette.base02 }, + MiniStatuslineInactive = { fg = palette.base03, bg = palette.base01 }, + } + end, + } +}) +vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme")) -- setup mini require('mini.basics').setup() require('mini.icons').setup() require('mini.pick').setup() +require('mini.git').setup() +require('mini.statusline').setup({ + content = { + active = function() + local function lsp_names() + local clients = vim.lsp.get_clients({ bufnr = 0 }) + if #clients == 0 then + return "" + end --- function to set colorsceme -vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme")) + local names = {} + for _, client in ipairs(clients) do + table.insert(names, client.name) + end + return "󰒋 " .. table.concat(names, ", ") + end + local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 }) + local git = MiniStatusline.section_git({ trunc_width = 40 }) + local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 }) + local filename = MiniStatusline.section_filename({ trunc_width = 140 }) + local location = MiniStatusline.section_location({ trunc_width = 10000 }) + return MiniStatusline.combine_groups({ + { hl = mode_hl, strings = { mode } }, + { hl = 'MiniStatuslineDevinfo', strings = { git, diagnostics, filename } }, + '%<', -- Mark general truncate point + '%=', -- End left alignment + { hl = 'MiniStatusLineDevIndo', strings = { lsp_names() } }, + { hl = mode_hl, strings = { location } }, + }) + end + } + +}) -- setup superior lsp vim.lsp.config("qml-language-server", { cmd = { "qml-language-server" }, @@ -78,4 +125,4 @@ end) map("n", "t", " terminal ") map("n", "", "Lspsaga term_toggle") map("t", "", "") -map("i", "", vim.lsp.completion.get, { desc = "trigger autocompletion" }) +map("i", "", "") From 09b0a8ff4bdae04f988565ac9ca8fd0ed413a0c9 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 4 Jun 2026 13:41:15 +0200 Subject: [PATCH 06/17] add luarc and remove it from gitignore --- .gitignore | 1 - .luarc.json | 7 +++++++ init.lua | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .luarc.json diff --git a/.gitignore b/.gitignore index 58c3ed1..1d1d495 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ nvim-pack-lock.json -.luarc.json diff --git a/.luarc.json b/.luarc.json new file mode 100644 index 0000000..8de7cb2 --- /dev/null +++ b/.luarc.json @@ -0,0 +1,7 @@ +{ + "diagnostics.globals": [ + "vim", + "Snacks", + "MiniStatusline" + ] +} diff --git a/init.lua b/init.lua index cd930a1..530f812 100644 --- a/init.lua +++ b/init.lua @@ -13,6 +13,7 @@ vim.diagnostic.config({ }) -- add plugins vim.pack.add({ + "https://github.com/nvim-treesitter/nvim-treesitter", "https://github.com/tinted-theming/tinted-nvim.git", "https://github.com/neovim/nvim-lspconfig", "https://github.com/vyfor/cord.nvim", From 83827e517942c7f1079cd83a9b73ccda0f086fac Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 4 Jun 2026 13:45:43 +0200 Subject: [PATCH 07/17] go back to lualine --- init.lua | 75 ++++++++++++++++++++++---------------------------------- 1 file changed, 29 insertions(+), 46 deletions(-) diff --git a/init.lua b/init.lua index 530f812..e4d8715 100644 --- a/init.lua +++ b/init.lua @@ -14,6 +14,8 @@ vim.diagnostic.config({ -- add plugins vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter", + "https://github.com/nvim-lualine/lualine.nvim", + "https://github.com/RRethy/base16-nvim", "https://github.com/tinted-theming/tinted-nvim.git", "https://github.com/neovim/nvim-lspconfig", "https://github.com/vyfor/cord.nvim", @@ -22,23 +24,12 @@ vim.pack.add({ -- function to set colorsceme require('tinted-nvim').setup({ ui = { - transparent = true + transparent = false }, highlights = { - overrides = function(palette) - return { - MiniStatuslineModeNormal = { fg = palette.base00, bg = palette.base0D, bold = true }, - MiniStatuslineModeInsert = { fg = palette.base00, bg = palette.base0B, bold = true }, - MiniStatuslineModeVisual = { fg = palette.base00, bg = palette.base0E, bold = true }, - MiniStatuslineModeReplace = { fg = palette.base00, bg = palette.base08, bold = true }, - MiniStatuslineModeCommand = { fg = palette.base00, bg = palette.base0A, bold = true }, - MiniStatuslineModeOther = { fg = palette.base00, bg = palette.base0C, bold = true }, - MiniStatuslineDevinfo = { fg = palette.base05, bg = palette.base02 }, - MiniStatuslineFilename = { fg = palette.base04, bg = palette.base01 }, - MiniStatuslineFileinfo = { fg = palette.base05, bg = palette.base02 }, - MiniStatuslineInactive = { fg = palette.base03, bg = palette.base01 }, - } - end, + integrations = { + lualine = true + } } }) vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme")) @@ -47,39 +38,31 @@ require('mini.basics').setup() require('mini.icons').setup() require('mini.pick').setup() require('mini.git').setup() -require('mini.statusline').setup({ - content = { - active = function() - local function lsp_names() - local clients = vim.lsp.get_clients({ bufnr = 0 }) - if #clients == 0 then - return "" - end - - local names = {} - for _, client in ipairs(clients) do - table.insert(names, client.name) - end - return "󰒋 " .. table.concat(names, ", ") - end - local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 }) - local git = MiniStatusline.section_git({ trunc_width = 40 }) - local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 }) - local filename = MiniStatusline.section_filename({ trunc_width = 140 }) - local location = MiniStatusline.section_location({ trunc_width = 10000 }) - - return MiniStatusline.combine_groups({ - { hl = mode_hl, strings = { mode } }, - { hl = 'MiniStatuslineDevinfo', strings = { git, diagnostics, filename } }, - '%<', -- Mark general truncate point - '%=', -- End left alignment - { hl = 'MiniStatusLineDevIndo', strings = { lsp_names() } }, - { hl = mode_hl, strings = { location } }, - }) - end +require("lualine").setup({ + options = { + section_separators = { left = "", right = "" }, + component_separators = { left = "|", right = "|" }, + globalstatus = true, + always_divide_middle = true, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "diagnostics" }, + lualine_c = { "filename", "filesize", }, + lualine_x = { "lsp_status", "filetype" }, + lualine_y = { "" }, + lualine_z = { "location" }, + }, + tabline = { + lualine_a = { { 'buffers', mode = 2, show_modified_status = true, } }, + lualine_b = { 'branch' }, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { 'tabs' } } - }) + -- setup superior lsp vim.lsp.config("qml-language-server", { cmd = { "qml-language-server" }, From 21c5121c5089d1202f6d1fb3e1c4a5615c6fd2ec Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 4 Jun 2026 13:57:52 +0200 Subject: [PATCH 08/17] add more globals --- .luarc.json | 3 ++- init.lua | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.luarc.json b/.luarc.json index 8de7cb2..efa9a93 100644 --- a/.luarc.json +++ b/.luarc.json @@ -2,6 +2,7 @@ "diagnostics.globals": [ "vim", "Snacks", - "MiniStatusline" + "MiniStatusline", + "MiniPick" ] } diff --git a/init.lua b/init.lua index e4d8715..ed33a88 100644 --- a/init.lua +++ b/init.lua @@ -37,7 +37,6 @@ vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-them require('mini.basics').setup() require('mini.icons').setup() require('mini.pick').setup() -require('mini.git').setup() require("lualine").setup({ options = { section_separators = { left = "", right = "" }, From 2c5944f2c33b307c696f87386bfdaec58db54918 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 5 Jun 2026 23:54:18 +0200 Subject: [PATCH 09/17] make config more minimal --- init.lua | 74 ++++++++++---------------------------------------------- 1 file changed, 13 insertions(+), 61 deletions(-) diff --git a/init.lua b/init.lua index ed33a88..a93d7f9 100644 --- a/init.lua +++ b/init.lua @@ -1,10 +1,9 @@ -local opt = vim.opt -opt.relativenumber = true +vim.opt.relativenumber = true vim.lsp.inlay_hint.enable = true -opt.tabstop = 8 +vim.opt.tabstop = 8 vim.opt.expandtab = true -opt.swapfile = false -opt.shiftwidth = 8 +vim.opt.swapfile = false +vim.opt.shiftwidth = 8 vim.diagnostic.config({ virtual_text = { spacing = 4, @@ -21,33 +20,11 @@ vim.pack.add({ "https://github.com/vyfor/cord.nvim", "https://github.com/nvim-mini/mini.nvim" }) --- function to set colorsceme -require('tinted-nvim').setup({ - ui = { - transparent = false - }, - highlights = { - integrations = { - lualine = true - } - } -}) -vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme")) --- setup mini -require('mini.basics').setup() -require('mini.icons').setup() -require('mini.pick').setup() require("lualine").setup({ - options = { - section_separators = { left = "", right = "" }, - component_separators = { left = "|", right = "|" }, - globalstatus = true, - always_divide_middle = true, - }, sections = { lualine_a = { "mode" }, lualine_b = { "diagnostics" }, - lualine_c = { "filename", "filesize", }, + lualine_c = { "filename" }, lualine_x = { "lsp_status", "filetype" }, lualine_y = { "" }, lualine_z = { "location" }, @@ -61,15 +38,15 @@ require("lualine").setup({ lualine_z = { 'tabs' } } }) - --- setup superior lsp -vim.lsp.config("qml-language-server", { - cmd = { "qml-language-server" }, - filetypes = { "qml" }, - root_markers = { { "qmldir", "shell.qml" }, ".git" }, +require('tinted-nvim').setup({ + selector = { enabled = true, mode = "cmd" }, }) -vim.lsp.enable("lua_ls") +require('mini.basics').setup() +require('mini.icons').setup() +require('mini.pick').setup() +vim.lsp.enable("lua_ls") +vim.lsp.enable("qmlls") vim.lsp.enable("qml-language-server") vim.lsp.enable("clangd") vim.lsp.enable("lua-language-server") @@ -79,33 +56,8 @@ require("cord").setup({ }, editor = { tooltip = "ur gay x3" }, }) - - --- keymaps local map = vim.keymap.set - -map("n", "ff", function() - MiniPick.builtin.files() -end) -map("n", "lg", function() - MiniPick.builtin.grep_live() -end) - -map("n", "", "h") -map("n", "", "j") -map("n", "", "k") -map("n", "", "l") -map("n", "", ":vertical resize -5", { silent = true }) -map("n", "", ":vertical resize +5", { silent = true }) -map("n", "", ":resize +5", { silent = true }) -map("n", "", ":resize -5", { silent = true }) --- lsp keybinds -map("n", "", function() - vim.lsp.buf.format() -end) - --- util keybinds +map("n", "", function() vim.lsp.buf.format() end) map("n", "t", " terminal ") -map("n", "", "Lspsaga term_toggle") map("t", "", "") map("i", "", "") From bfed137052dfcceb0640f6cac154b370ae5323c4 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 6 Jun 2026 18:36:39 +0200 Subject: [PATCH 10/17] stuff --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index ed33a88..563566d 100644 --- a/init.lua +++ b/init.lua @@ -58,7 +58,7 @@ require("lualine").setup({ lualine_c = {}, lualine_x = {}, lualine_y = {}, - lualine_z = { 'tabs' } + lualine_z = { 'tabs' } } }) From 13280810671ce98fd6dc36203be97a5cf214c512 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 6 Jun 2026 18:39:23 +0200 Subject: [PATCH 11/17] add binds for tabs --- init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init.lua b/init.lua index 38480d8..9782aed 100644 --- a/init.lua +++ b/init.lua @@ -57,6 +57,9 @@ require("cord").setup({ editor = { tooltip = "ur gay x3" }, }) local map = vim.keymap.set +for i=1,10 do + map("n", "", " LualineBuffersJump! " .. i .. "") +end map("n", "", function() vim.lsp.buf.format() end) map("n", "t", " terminal ") map("t", "", "") From dac8b6432338a3cda03ee83587d154ff527c018e Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 11 Jun 2026 12:03:58 +0200 Subject: [PATCH 12/17] restructure init.lua --- init.lua | 55 +++++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/init.lua b/init.lua index 9782aed..edaadfd 100644 --- a/init.lua +++ b/init.lua @@ -10,16 +10,41 @@ vim.diagnostic.config({ source = true, }, }) +vim.lsp.enable("lua_ls") +vim.lsp.enable("qmlls") +vim.lsp.enable("clangd") +vim.lsp.enable("lua-language-server") +local map = vim.keymap.set +for i = 1, 10 do + map("n", "", " LualineBuffersJump! " .. i .. "") +end +map("n", "", function() vim.lsp.buf.format() end) +map("n", "t", " terminal ") +map("t", "", "") +map("i", "", "") -- add plugins vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter", - "https://github.com/nvim-lualine/lualine.nvim", "https://github.com/RRethy/base16-nvim", + "https://github.com/nvim-lualine/lualine.nvim", "https://github.com/tinted-theming/tinted-nvim.git", "https://github.com/neovim/nvim-lspconfig", "https://github.com/vyfor/cord.nvim", "https://github.com/nvim-mini/mini.nvim" }) +require('tinted-nvim').setup({ + selector = { enabled = true, mode = "cmd" }, +}) +require('mini.basics').setup() +require('mini.icons').setup() +require('mini.pick').setup() + +require("cord").setup({ + display = { + theme = "atom", + }, + editor = { tooltip = "ur gay x3" }, +}) require("lualine").setup({ sections = { lualine_a = { "mode" }, @@ -35,32 +60,6 @@ require("lualine").setup({ lualine_c = {}, lualine_x = {}, lualine_y = {}, - lualine_z = { 'tabs' } + lualine_z = { 'tabs' } } }) -require('tinted-nvim').setup({ - selector = { enabled = true, mode = "cmd" }, -}) -require('mini.basics').setup() -require('mini.icons').setup() -require('mini.pick').setup() - -vim.lsp.enable("lua_ls") -vim.lsp.enable("qmlls") -vim.lsp.enable("qml-language-server") -vim.lsp.enable("clangd") -vim.lsp.enable("lua-language-server") -require("cord").setup({ - display = { - theme = "atom", - }, - editor = { tooltip = "ur gay x3" }, -}) -local map = vim.keymap.set -for i=1,10 do - map("n", "", " LualineBuffersJump! " .. i .. "") -end -map("n", "", function() vim.lsp.buf.format() end) -map("n", "t", " terminal ") -map("t", "", "") -map("i", "", "") From ad191099a166ba048cd149a8e27652c5e12641d4 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 11 Jun 2026 12:09:37 +0200 Subject: [PATCH 13/17] remove base16-colorschemes plugin to just use tinted-nvim --- init.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index edaadfd..92b28e5 100644 --- a/init.lua +++ b/init.lua @@ -25,7 +25,6 @@ map("i", "", "") -- add plugins vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter", - "https://github.com/RRethy/base16-nvim", "https://github.com/nvim-lualine/lualine.nvim", "https://github.com/tinted-theming/tinted-nvim.git", "https://github.com/neovim/nvim-lspconfig", @@ -46,6 +45,9 @@ require("cord").setup({ editor = { tooltip = "ur gay x3" }, }) require("lualine").setup({ + options = { + theme = "tinted", + }, sections = { lualine_a = { "mode" }, lualine_b = { "diagnostics" }, From a2a00851c91c470f9832c245a19a2d82f8907543 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 15 Jun 2026 10:44:33 +0200 Subject: [PATCH 14/17] restructure and add bind to close buffers --- init.lua | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 92b28e5..c234bc7 100644 --- a/init.lua +++ b/init.lua @@ -14,14 +14,6 @@ vim.lsp.enable("lua_ls") vim.lsp.enable("qmlls") vim.lsp.enable("clangd") vim.lsp.enable("lua-language-server") -local map = vim.keymap.set -for i = 1, 10 do - map("n", "", " LualineBuffersJump! " .. i .. "") -end -map("n", "", function() vim.lsp.buf.format() end) -map("n", "t", " terminal ") -map("t", "", "") -map("i", "", "") -- add plugins vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter", @@ -65,3 +57,12 @@ require("lualine").setup({ lualine_z = { 'tabs' } } }) +local map = vim.keymap.set +for i = 1, 10 do + map("n", "", " LualineBuffersJump! " .. i .. "") +end +map("n", "", function() vim.lsp.buf.format() end) +map("n", "t", " terminal ") +map("t", "", "") +map("i", "", "") +map("n", "w", " bdelete! ") From 6b9f3f886124070921cb85b7fc9744c52e7e236e Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 27 Jun 2026 00:48:20 +0200 Subject: [PATCH 15/17] add nice autocomplete and indent guides" --- init.lua | 69 +------------------------------------------------------- 1 file changed, 1 insertion(+), 68 deletions(-) mode change 100644 => 120000 init.lua diff --git a/init.lua b/init.lua deleted file mode 100644 index c234bc7..0000000 --- a/init.lua +++ /dev/null @@ -1,68 +0,0 @@ -vim.opt.relativenumber = true -vim.lsp.inlay_hint.enable = true -vim.opt.tabstop = 8 -vim.opt.expandtab = true -vim.opt.swapfile = false -vim.opt.shiftwidth = 8 -vim.diagnostic.config({ - virtual_text = { - spacing = 4, - source = true, - }, -}) -vim.lsp.enable("lua_ls") -vim.lsp.enable("qmlls") -vim.lsp.enable("clangd") -vim.lsp.enable("lua-language-server") --- add plugins -vim.pack.add({ - "https://github.com/nvim-treesitter/nvim-treesitter", - "https://github.com/nvim-lualine/lualine.nvim", - "https://github.com/tinted-theming/tinted-nvim.git", - "https://github.com/neovim/nvim-lspconfig", - "https://github.com/vyfor/cord.nvim", - "https://github.com/nvim-mini/mini.nvim" -}) -require('tinted-nvim').setup({ - selector = { enabled = true, mode = "cmd" }, -}) -require('mini.basics').setup() -require('mini.icons').setup() -require('mini.pick').setup() - -require("cord").setup({ - display = { - theme = "atom", - }, - editor = { tooltip = "ur gay x3" }, -}) -require("lualine").setup({ - options = { - theme = "tinted", - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "diagnostics" }, - lualine_c = { "filename" }, - lualine_x = { "lsp_status", "filetype" }, - lualine_y = { "" }, - lualine_z = { "location" }, - }, - tabline = { - lualine_a = { { 'buffers', mode = 2, show_modified_status = true, } }, - lualine_b = { 'branch' }, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { 'tabs' } - } -}) -local map = vim.keymap.set -for i = 1, 10 do - map("n", "", " LualineBuffersJump! " .. i .. "") -end -map("n", "", function() vim.lsp.buf.format() end) -map("n", "t", " terminal ") -map("t", "", "") -map("i", "", "") -map("n", "w", " bdelete! ") diff --git a/init.lua b/init.lua new file mode 120000 index 0000000..88167d1 --- /dev/null +++ b/init.lua @@ -0,0 +1 @@ +../../dotfiles/nvim/.config/nvim/init.lua \ No newline at end of file From 4bb0cf94884b9a2f9bcb9b5f4a8d0cf25d504399 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 8 Oct 2026 22:44:03 +0200 Subject: [PATCH 16/17] resync branches --- .marker | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .marker diff --git a/.marker b/.marker new file mode 100644 index 0000000..e69de29 From 3ada736cefae74cbdbfb66efb934a6dd12cfb8d5 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 8 Oct 2026 22:44:04 +0200 Subject: [PATCH 17/17] remove marker --- .marker | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .marker diff --git a/.marker b/.marker deleted file mode 100644 index e69de29..0000000