From 21c5121c5089d1202f6d1fb3e1c4a5615c6fd2ec Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 4 Jun 2026 13:57:52 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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