From 0984ac2838585ac357890f74d3ba26df209c358f Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Wed, 10 Apr 2024 18:00:44 -0700 Subject: [PATCH] [vim] lualine --- .vim/lua/lualine_setup.lua | 1 + .vim/nvim.lua | 31 +++++++++++++++++-------------- .vimrc | 5 +++-- .yarnrc | 2 +- 4 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 .vim/lua/lualine_setup.lua diff --git a/.vim/lua/lualine_setup.lua b/.vim/lua/lualine_setup.lua new file mode 100644 index 0000000..90e6db2 --- /dev/null +++ b/.vim/lua/lualine_setup.lua @@ -0,0 +1 @@ +require('lualine').setup() diff --git a/.vim/nvim.lua b/.vim/nvim.lua index 0a15cfc..0dd841e 100644 --- a/.vim/nvim.lua +++ b/.vim/nvim.lua @@ -106,9 +106,11 @@ local function pyright_custom_diagnostic(a, params, client_id, c, config) vim.lsp.diagnostic.on_publish_diagnostics(a, params, client_id, c, config) end -nvim_lsp.pyright.setup({ on_attach = function(client, bufnr) - vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(pyright_custom_diagnostic, diagnostic_options) -end }) +nvim_lsp.pyright.setup({ + on_attach = function(client, bufnr) + vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(pyright_custom_diagnostic, diagnostic_options) + end +}) --nvim_lsp.pyright.setup({ on_attach = on_attach }) --nvim_lsp.pylsp.setup({ --on_attach = on_attach, @@ -387,17 +389,17 @@ require('trouble').setup { jump = { "o", "" }, -- jump to the diagnostic or open / close folds --open_split = { "" }, -- open buffer in new split --open_vsplit = { "" }, -- open buffer in new vsplit - open_tab = {}, -- open buffer in new tab - jump_close = { "" }, -- jump to the diagnostic and close the list - toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode - toggle_preview = "P", -- toggle auto_preview - hover = "K", -- opens a small popup with the full multiline message - preview = "p", -- preview the diagnostic location + open_tab = {}, -- open buffer in new tab + jump_close = { "" }, -- jump to the diagnostic and close the list + toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode + toggle_preview = "P", -- toggle auto_preview + hover = "K", -- opens a small popup with the full multiline message + preview = "p", -- preview the diagnostic location close_folds = { "zM", "zm" }, -- close all folds - open_folds = { "zR", "zr" }, -- open all folds + open_folds = { "zR", "zr" }, -- open all folds toggle_fold = { "zA", "za" }, -- toggle fold of current file - previous = "k", -- previous item - next = "j" -- next item + previous = "k", -- previous item + next = "j" -- next item }, } @@ -510,9 +512,9 @@ require 'nvim-treesitter.configs'.setup { "python", "query", "rust", - "svelte", "terraform", "toml", + "tsx", "typescript", "vim", "yaml", @@ -549,7 +551,7 @@ require 'nvim-treesitter.configs'.setup { playground = { enable = true, disable = {}, - updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code + updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code persist_queries = false, -- Whether the query persists across vim sessions keybindings = { toggle_query_editor = 'o', @@ -668,3 +670,4 @@ end require("murdock") require("lir_setup") +require("lualine_setup") diff --git a/.vimrc b/.vimrc index b80a90d..52f07b8 100644 --- a/.vimrc +++ b/.vimrc @@ -143,8 +143,9 @@ Plug 'sjbach/lusty' "Plug 'w0rp/ale' "Plug 'airblade/vim-gitgutter' Plug 'mhinz/vim-signify' -Plug 'vim-airline/vim-airline' -Plug 'vim-airline/vim-airline-themes' +"Plug 'vim-airline/vim-airline' +"Plug 'vim-airline/vim-airline-themes' +Plug 'nvim-lualine/lualine.nvim' "Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } "Plug 'junegunn/fzf.vim' Plug 'airblade/vim-rooter' diff --git a/.yarnrc b/.yarnrc index c0c6531..ff3638e 100644 --- a/.yarnrc +++ b/.yarnrc @@ -2,5 +2,5 @@ # yarn lockfile v1 -lastUpdateCheck 1664156115452 +lastUpdateCheck 1711242871592 prefix "/home/barak/.yarn"