diff --git a/init.lua b/init.lua index f7be10a..f5a9159 100644 --- a/init.lua +++ b/init.lua @@ -5,14 +5,14 @@ vim.g.maplocalleader = "\\" opt.number = true opt.relativenumber = true -opt.cursorline = true +opt.cursorline = false opt.termguicolors = true opt.winborder = "rounded" opt.signcolumn = "yes" vim.lsp.inlay_hint.enable = true opt.tabstop = 8 vim.opt.expandtab = true -vim.g.tinted_background_transparent = 0 +vim.g.tinted_background_transparent = 1 opt.swapfile = false opt.winborder = "single" @@ -37,25 +37,16 @@ vim.pack.add({ { src = "https://github.com/Saghen/blink.cmp", version = "v1" }, }) -- function to set colorsceme -local default_theme = "base16-oceanicnext" -local function get_tinty_theme() - local theme_name = vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme") +vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme")) - if vim.v.shell_error ~= 0 then - return default_theme - else - return vim.trim(theme_name) - end -end -vim.cmd("colorscheme " .. get_tinty_theme()) -- set up qmlls to point to the right binary -vim.lsp.config.qml = { - name = "qml-language-server", +vim.lsp.config.qmlls = { + name = "qmlls", filetypes = { "qml" }, - cmd = { "qml-language-server" }, + cmd = { "qmlls6" }, } -vim.lsp.enable("qml") +vim.lsp.enable("qmlls") require("blink.cmp").setup({ fuzzy = { implementation = "prefer_rust_with_warning" }, completion = { @@ -163,29 +154,3 @@ map("n", "", "Lspsaga term_toggle") map("t", "", "") map("i", "", vim.lsp.completion.get, { desc = "trigger autocompletion" }) --- tinty function - -local function handle_focus_gained() - local new_theme_name = get_tinty_theme() - local current_theme_name = vim.g.colors_name - - if current_theme_name ~= new_theme_name then - vim.cmd("colorscheme " .. new_theme_name) - require("lualine").setup() - end - require("lualine").setup() -end - -local function main() - vim.o.termguicolors = true - vim.g.tinted_colorspace = 256 - local current_theme_name = get_tinty_theme() - - vim.cmd("colorscheme " .. current_theme_name) - - vim.api.nvim_create_autocmd("FocusGained", { - callback = handle_focus_gained, - }) -end - -main()