From 24c567c5ed47daf56ee1033d2d5b9fef6e0c4387 Mon Sep 17 00:00:00 2001 From: lucy Date: Tue, 2 Jun 2026 21:07:56 +0200 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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" },