summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2024-03-27 00:22:31 +0000
committerJosh Rahm <rahm@google.com>2024-03-27 00:22:31 +0000
commit715e1be7dca3b6dd7a337e53b35502e5d1472e0f (patch)
tree8f11f92583c3736dad6200f31058315fde14f99b
parent998742b3ba0742f724b938bb3a95170616f862da (diff)
downloadconfig.vim-715e1be7dca3b6dd7a337e53b35502e5d1472e0f.tar.gz
config.vim-715e1be7dca3b6dd7a337e53b35502e5d1472e0f.tar.bz2
config.vim-715e1be7dca3b6dd7a337e53b35502e5d1472e0f.zip
More ricing. Primarily with Lualine.
-rw-r--r--colors/gen_meltdown.vim168
-rw-r--r--colors/meltdown_ng.vim44
-rw-r--r--init.vim40
-rw-r--r--lua/lsp.lua11
-rw-r--r--lua/lualinesetup.lua42
5 files changed, 94 insertions, 211 deletions
diff --git a/colors/gen_meltdown.vim b/colors/gen_meltdown.vim
deleted file mode 100644
index 3d5f5ed..0000000
--- a/colors/gen_meltdown.vim
+++ /dev/null
@@ -1,168 +0,0 @@
-
-if version > 580
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
-endif
-let g:colors_name='meltdown_gen'
-
-if &background == 'dark'
-
-hi IncSearch guifg=#ff5d34 ctermfg=202 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#ff5d34 ctermfg=202 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
-hi Green1 guifg=#80ab24 ctermfg=106
-hi Green3 guifg=#aba024 ctermfg=142
-hi Green2 guifg=#3dab24 ctermfg=034
-hi TabLineFill guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233
-hi Sage1 guifg=#9f9a84 ctermfg=144
-hi Search guifg=#ffd780 ctermfg=222 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse
-hi Sage3 guifg=#96a677 ctermfg=144
-hi Sage2 guifg=#8e9f84 ctermfg=108
-hi MatchParen guibg=#346063 ctermbg=023 gui=bold cterm=bold
-hi VertSplit guifg=#0f0e0e ctermfg=233 guibg=#0f0e0e ctermbg=233
-hi Red3 guifg=#ff3448 ctermfg=203
-hi Red2 guifg=#ff8f34 ctermfg=208
-hi Red1 guifg=#ff5d34 ctermfg=202
-hi Normal guifg=#d8e5b8 ctermfg=187 guibg=#1e1d1c ctermbg=234
-hi Red6 guifg=#ff74f4 ctermfg=213
-hi Red5 guifg=#ff9074 ctermfg=209
-hi Red4 guifg=#ffa034 ctermfg=215
-hi LineNr guifg=#9f9a84 ctermfg=144 guibg=#1a1818 ctermbg=234 gui=bold cterm=bold
-hi DarkGray guifg=#404040 ctermfg=238
-hi StatusLine guifg=#ff5d34 ctermfg=202 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
-hi Title guifg=#ff8f34 ctermfg=208 guibg=#444040 ctermbg=238 gui=bold cterm=bold
-hi ColorColumn guibg=#4d5c8b ctermbg=060
-hi Visual guifg=#101010 ctermfg=233 guibg=#e0e0e0 ctermbg=188
-hi Fern1 guifg=#71bc78 ctermfg=071
-hi Blue1 guifg=#80a0ff ctermfg=111
-hi Blue3 guifg=#80ffdf ctermfg=122
-hi Blue2 guifg=#af80ff ctermfg=141
-hi Blue4 guifg=#d0e0ff ctermfg=189
-hi Teal1 guifg=#34ffd6 ctermfg=050
-hi CursorLineNr guifg=#ff5d34 ctermfg=202 guibg=#272424 ctermbg=235
-hi StatusLineNC guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
-hi Folded guifg=#000000 ctermfg=000 guibg=#9f9a84 ctermbg=144
-hi TabLine guifg=#686060 ctermfg=241 guibg=#444040 ctermbg=238 gui=bold cterm=bold
-hi SignColumn guibg=#1a1818 ctermbg=234
-hi Yellow1 guifg=#e0bf65 ctermfg=179
-hi Error guifg=#ff0000 ctermfg=009 guibg=#1a1818 ctermbg=234
-hi Directory guifg=#80a0ff ctermfg=111 gui=bold cterm=bold
-hi CursorLine guibg=#313030 ctermbg=236
-hi NonText guifg=#80a0ff ctermfg=111 guibg=#272424 ctermbg=235 gui=bold cterm=bold
-hi DarkTeal guifg=#346063 ctermfg=023
-hi Orange5 guifg=#ffd780 ctermfg=222
-hi Orange4 guifg=#ffb780 ctermfg=215
-hi Orange6 guifg=#ff9780 ctermfg=209
-hi Orange1 guifg=#ff892f ctermfg=208
-hi Orange3 guifg=#ff552f ctermfg=009
-hi Orange2 guifg=#ffbd2f ctermfg=214
-hi Warning guifg=#ffff00 ctermfg=011 guibg=#1a1818 ctermbg=234
-hi javaParen guifg=#80a0ff ctermfg=111 gui=bold cterm=bold
-hi Sage3Mix guifg=#8ba3bb ctermfg=110
-hi PMenu guifg=#686060 ctermfg=241 guibg=#444040 ctermbg=238
-hi CursorColumn guibg=#313030 ctermbg=236
-hi PMenuSel guifg=#ff5d34 ctermfg=202 guibg=#343030 ctermbg=236 gui=bold cterm=bold
-
-else
-
-hi IncSearch guifg=#b41400 ctermfg=124 guibg=#ffffff ctermbg=015 gui=reverse cterm=reverse
-hi TabLineSel guifg=#b41400 ctermfg=124 guibg=#f4f3f3 ctermbg=255 gui=bold cterm=bold
-hi Green1 guifg=#265f00 ctermfg=022
-hi Green3 guifg=#545600 ctermfg=058
-hi Green2 guifg=#006d00 ctermfg=022
-hi TabLineFill guifg=#938b8b ctermfg=245 guibg=#f4f3f3 ctermbg=255
-hi Sage1 guifg=#585742 ctermfg=240
-hi Search guifg=#311d00 ctermfg=235 guibg=#ffffff ctermbg=015 gui=reverse cterm=reverse
-hi Sage3 guifg=#43562b ctermfg=022
-hi Sage2 guifg=#495b42 ctermfg=240
-hi MatchParen guibg=#749ea1 ctermbg=109 gui=bold cterm=bold
-hi VertSplit guifg=#f4f3f3 ctermfg=255 guibg=#f4f3f3 ctermbg=255
-hi Red3 guifg=#d2002d ctermfg=160
-hi Red2 guifg=#7f2800 ctermfg=088
-hi Red1 guifg=#b41400 ctermfg=124
-hi Normal guifg=#152100 ctermfg=234 guibg=#e1e0de ctermbg=188
-hi Red6 guifg=#8f0088 ctermfg=090
-hi Red5 guifg=#7d2212 ctermfg=001
-hi Red4 guifg=#6b2900 ctermfg=001
-hi LineNr guifg=#585742 ctermfg=240 guibg=#e9e6e6 ctermbg=254 gui=bold cterm=bold
-hi DarkGray guifg=#b3b3b3 ctermfg=249
-hi StatusLine guifg=#b41400 ctermfg=124 guibg=#f4f3f3 ctermbg=255 gui=bold cterm=bold
-hi Title guifg=#7f2800 ctermfg=088 guibg=#b5b1b1 ctermbg=249 gui=bold cterm=bold
-hi ColorColumn guibg=#8a8ec3 ctermbg=103
-hi Visual guifg=#f2f1f1 ctermfg=255 guibg=#1d1d1d ctermbg=234
-hi Fern1 guifg=#005417 ctermfg=022
-hi Blue1 guifg=#30489e ctermfg=061
-hi Blue3 guifg=#00250e ctermfg=234
-hi Blue2 guifg=#7239b5 ctermfg=092
-hi Blue4 guifg=#121e35 ctermfg=234
-hi Teal1 guifg=#002b10 ctermfg=022
-hi CursorLineNr guifg=#b41400 ctermfg=124 guibg=#d9d5d5 ctermbg=253
-hi StatusLineNC guifg=#938b8b ctermfg=245 guibg=#f4f3f3 ctermbg=255 gui=bold cterm=bold
-hi Folded guifg=#ffffff ctermfg=015 guibg=#585742 ctermbg=240
-hi TabLine guifg=#938b8b ctermfg=245 guibg=#b5b1b1 ctermbg=249 gui=bold cterm=bold
-hi SignColumn guibg=#e9e6e6 ctermbg=254
-hi Yellow1 guifg=#413200 ctermfg=058
-hi Error guifg=#e50000 ctermfg=160 guibg=#e9e6e6 ctermbg=254
-hi Directory guifg=#30489e ctermfg=061 gui=bold cterm=bold
-hi CursorLine guibg=#c7c6c6 ctermbg=251
-hi NonText guifg=#30489e ctermfg=061 guibg=#d9d5d5 ctermbg=253 gui=bold cterm=bold
-hi DarkTeal guifg=#749ea1 ctermfg=109
-hi Orange5 guifg=#311d00 ctermfg=235
-hi Orange4 guifg=#512300 ctermfg=052
-hi Orange6 guifg=#752216 ctermfg=001
-hi Orange1 guifg=#852700 ctermfg=088
-hi Orange3 guifg=#bb0c00 ctermfg=124
-hi Orange2 guifg=#4c2700 ctermfg=052
-hi Warning guifg=#1b1300 ctermfg=233 guibg=#e9e6e6 ctermbg=254
-hi javaParen guifg=#30489e ctermfg=061 gui=bold cterm=bold
-hi Sage3Mix guifg=#3f5268 ctermfg=024
-hi PMenu guifg=#938b8b ctermfg=245 guibg=#b5b1b1 ctermbg=249
-hi CursorColumn guibg=#c7c6c6 ctermbg=251
-hi PMenuSel guifg=#b41400 ctermfg=124 guibg=#c9c4c4 ctermbg=251 gui=bold cterm=bold
-
-endif
-
-hi! link TagbarAccessProtected Yellow1
-hi! link javaDocTags Orange6
-hi! link xmlTag Blue1
-hi! link RadiationCppNamespace Sage2
-hi! link RadiationJavaAbstractClass Red4
-hi! link StorageClass Red1
-hi! link Statement Blue1
-hi! link RadiationJavaTypeParameter Red6
-hi! link javaAnnotation PreProc
-hi! link htmlEndTag Blue2
-hi! link Type Red2
-hi! link FoldColumn Green1
-hi! link Function Green3
-hi! link RadiationProtoType Red5
-hi! link RadiationCppStruct Type
-hi! link xmlAttrib Green3
-hi! link RadiationJavaParam Orange3
-hi! link RadiationJavaForIterator Sage3Mix
-hi! link RadiationJavaMember Yellow1
-hi! link Structure Red1
-hi! link RadiationCppUnion Type
-hi! link htmlTagName Blue1
-hi! link PreProc Sage3
-hi! link RadiationCppEnum Type
-hi! link RadiationJavaLocalVar Sage2
-hi! link TagbarAccessPublic Green1
-hi! link xmlEndTag Red1
-hi! link Identifier Orange4
-hi! link javaOperator Operator
-hi! link RadiationJavaEnhancedForIterator RadiationJavaForIterator
-hi! link String Green1
-hi! link Comment Sage3Mix
-hi! link RadiationCppTypedef RadiationProtoType
-hi! link javaCommentTitle Blue1
-hi! link Constant PreProc
-hi! link SpecialKey Blue1
-hi! link Number Constant
-hi! link javaDocComment Comment
-hi! link TagbarAccessPrivate Red1
-hi! link htmlTag Blue2
-hi! link Operator Blue1
-hi! link RadiationJavaInterface RadiationProtoType
-hi! link Special Orange2
diff --git a/colors/meltdown_ng.vim b/colors/meltdown_ng.vim
index 16620be..5402e85 100644
--- a/colors/meltdown_ng.vim
+++ b/colors/meltdown_ng.vim
@@ -11,33 +11,20 @@ hi Magenta guifg=#ff83ff
hi DarkGrey guifg=#7b7b7b
hi LighterGrey guifg=#9a9a9a
hi Salmon guifg=#ff7779
-hi IncSearch guifg=#ff5d34 ctermfg=202 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#1f1d2a guibg=#ff7779 ctermfg=202 ctermbg=233 gui=none
hi Green1 guifg=#26ff00 ctermfg=106
hi Green3 guifg=#aba024 ctermfg=142
hi Green2 guifg=#3dab24 ctermfg=034
-hi TabLineFill guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233
hi Sage1 guifg=#9f9a84 ctermfg=144
-hi Search guifg=#ffd780 ctermfg=222 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse
hi Sage3 guifg=#b0c4a3 ctermfg=144
hi Sage2 guifg=#a6b99a
hi Sage4 guifg=#8e9f84 ctermfg=108
hi Sage5 guifg=#8e9f84 ctermfg=108
-hi MatchParen guibg=#346063 ctermbg=023 gui=bold cterm=bold
-hi VertSplit guifg=#0f0e0e ctermfg=233 guibg=#0f0e0e ctermbg=233
-hi WinSeparator guifg=#0f0e0e ctermfg=233 guibg=#0f0e0e ctermbg=233
hi Red3 guifg=#ff3448 ctermfg=203
hi Red2 guifg=#ff8f34 ctermfg=208
hi Red1 guifg=#ff5d34 ctermfg=202
-hi Normal guifg=#d8e5b8 ctermfg=187 guibg=#1f1d2a ctermbg=234
hi Red6 guifg=#ff74f4 ctermfg=213
hi Red5 guifg=#ff9074 ctermfg=209
hi Red4 guifg=#ffa034 ctermfg=215
-hi DarkGray guifg=#404040 ctermfg=238
-hi StatusLine guifg=#ff5d34 ctermfg=202 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
-hi Title guifg=#ff8f34 ctermfg=208 guibg=#444040 ctermbg=238 gui=bold cterm=bold
-hi ColorColumn guibg=#4d5c8b ctermbg=060
-hi Visual guifg=#101010 ctermfg=233 guibg=#e0e0e0 ctermbg=188
hi Fern1 guifg=#71bc78 ctermfg=071
hi Blue1 guifg=#80a0ff ctermfg=111
hi Blue3 guifg=#80ffdf ctermfg=122
@@ -45,13 +32,8 @@ hi Blue2 guifg=#af80ff ctermfg=141
hi Blue4 guifg=#c3bbff ctermfg=189
hi Teal1 guifg=#76dbd8 ctermfg=050
hi Teal2 guifg=#71fffa
-hi CursorLineNr guifg=#ff5d34 ctermfg=202 guibg=#272424 ctermbg=235
-hi StatusLineNC guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
-hi Folded guifg=#000000 ctermfg=000 guibg=#9f9a84 ctermbg=144
-hi TabLine guifg=#d4d4d4 guibg=#2d2d2d gui=none
" hi SignColumn guibg=#1a1818 ctermbg=234
-hi SignColumn guibg=#1f1d2a ctermbg=234
hi Yellow1 guifg=#ffb700 ctermfg=179
hi Error guifg=#ff0000 ctermfg=009 guibg=#1a1818 ctermbg=234
hi Directory guifg=#80a0ff ctermfg=111 gui=bold cterm=bold
@@ -71,6 +53,25 @@ hi PMenu guifg=#ff7779 ctermfg=241 guibg=#14151d ctermbg=238
hi CursorColumn guibg=#313030 ctermbg=236
hi PMenuSel guifg=#ff5d34 ctermfg=202 guibg=#343030 ctermbg=236 gui=bold cterm=bold
+hi TabLineFill guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233
+hi IncSearch guifg=#ff5d34 ctermfg=202 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse
+hi TabLineSel guifg=#1f1d2a guibg=#ff7779 ctermfg=202 ctermbg=233 gui=none
+hi MatchParen guibg=#346063 ctermbg=023 gui=bold cterm=bold
+hi VertSplit guifg=#0f0e0e ctermfg=233 guibg=#0f0e0e ctermbg=233
+hi WinSeparator guifg=#0f0e0e ctermfg=233 guibg=#0f0e0e ctermbg=233
+hi Normal guifg=#d8e5b8 ctermfg=187 guibg=#1f1d2a ctermbg=234
+hi DarkGray guifg=#404040 ctermfg=238
+hi StatusLine guifg=#ff5d34 ctermfg=202 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
+hi ColorColumn guibg=#4d5c8b ctermbg=060
+hi Title guifg=#ff8f34 ctermfg=208 guibg=#444040 ctermbg=238 gui=bold cterm=bold
+hi Visual guifg=#101010 ctermfg=233 guibg=#e0e0e0 ctermbg=188
+hi CursorLineNr guifg=#ff5d34 ctermfg=202 guibg=#272424 ctermbg=235
+hi StatusLineNC guifg=#686060 ctermfg=241 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
+hi Folded guifg=#000000 ctermfg=000 guibg=#9f9a84 ctermbg=144
+hi TabLine guifg=#d4d4d4 guibg=#2d2d2d gui=none
+hi Search guifg=#ffd780 ctermfg=222 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse
+hi SignColumn guibg=#1f1d2a ctermbg=234
+
hi! link TagbarAccessProtected Yellow1
hi! link javaDocTags Orange6
hi! link xmlTag Blue1
@@ -229,6 +230,13 @@ hi! link DiagnosticInfo Teal2
hi DiagnosticError guifg=red
hi ColorColumn guifg=#644141 guibg=none gui=None
+hi! link vimAugroup PreProc
+hi! link vimAutoCmdGroup vimAugroup
+hi! link vimAutoCmdSfxList vimAugroup
+hi! link vimAugroupEnd vimAugroup
+hi! link vimUsrCmd vimCommand
+hi! link vimSetEqual Number
+
hi TabLineCloseSel guifg=#790000 guibg=#ff5d34
hi TabLineClose guifg=#0f0e0e guibg=#2d2d2d
hi TabLineTail guifg=#ff8082 guibg=#0f0e0e
diff --git a/init.vim b/init.vim
index a91c4cd..2ad7df0 100644
--- a/init.vim
+++ b/init.vim
@@ -16,13 +16,14 @@ if filereadable(printf('%s/.config/nvim/local-plug.vim', $HOME))
exec "source " . printf('%s/.config/nvim/local-plug.vim', $HOME)
endif
-Plug 'lukas-reineke/virt-column.nvim'
-Plug 'dylnmc/synstack.vim'
+Plug 'nvim-lua/lsp-status.nvim'
+Plug 'bfrg/vim-jq'
Plug 'folke/trouble.nvim'
Plug 'git@git.josher.dev:bulletjava.vim.git'
-Plug 'git@git.josher.dev:nvim-warp.git'
Plug 'git@git.josher.dev:fieldmarshal.vim.git'
Plug 'git@git.josher.dev:nvim-color-picker.git'
+Plug 'git@git.josher.dev:nvim-warp.git'
+Plug 'git@git.josher.dev:meltdown.git'
Plug 'google/vim-codefmt'
Plug 'google/vim-glaive'
Plug 'google/vim-maktaba'
@@ -34,8 +35,7 @@ Plug 'hrsh7th/cmp-vsnip'
Plug 'hrsh7th/nvim-cmp'
Plug 'hrsh7th/vim-vsnip'
Plug 'kyazdani42/nvim-web-devicons'
-Plug 'linrongbin16/lsp-progress.nvim'
-Plug 'nanozuki/tabby.nvim'
+Plug 'lukas-reineke/virt-column.nvim'
Plug 'nanozuki/tabby.nvim'
Plug 'neovim/nvim-lspconfig'
Plug 'nvim-lua/plenary.nvim'
@@ -69,9 +69,15 @@ set scrolloff=8
set number
set relativenumber
set pumheight=20
+set updatetime=1000
let mapleader=" "
+function! Jump(...)
+ normal! '[
+endfunction
+noremap <silent> g. <cmd>set operatorfunc=Noop<cr>g@
+
" Make splitting more congruent with how Tmux does it.
noremap <C-w>% <C-w>v
noremap <C-w>" <C-w>s
@@ -127,6 +133,9 @@ augroup InitVim
autocmd TextYankPost *
\ lua require'vim.highlight'.on_yank(
\ { higroup = "IncSearch", timeout = 100 });
+ autocmd CursorHold * lua vim.lsp.buf.document_highlight()
+ autocmd CursorHoldI * lua vim.lsp.buf.document_highlight()
+ autocmd CursorMoved * lua vim.lsp.buf.clear_references()
augroup END
" Local configuration that can be set by hostname or just a local configuration.
@@ -170,15 +179,14 @@ nnoremap <M-h> <cmd>bprev<cr>
noremap <C-g> <cmd>lua vim.diagnostic.open_float()<cr>
+noremap <leader><C-f> <cmd>WarpFull<cr>
+
noremap <C-f> <cmd>WarpGrid<cr>
onoremap <C-f> v<cmd>WarpGrid<cr>
noremap <leader>w <cmd>WarpWords<cr>
onoremap <leader>w v<cmd>WarpWords<cr>
-noremap <M-w> <cmd>lua require('warp').run(require('warp.strategy.words').words_strategy)<cr>
-onoremap <M-w> v<cmd>lua require('warp').run(require('warp.strategy.words').words_strategy)<cr>
-
nmap œ <leader>k
nmap ï <leader>j
omap œ <leader>k
@@ -222,10 +230,6 @@ command! TERM exec "term sh -c " . shellescape(printf("cd %s && exec ", shellesc
" W = w. I often click when typing :w
command! W w
-augroup lualine_augroup
- autocmd!
- autocmd User LspProgressStatusUpdated lua require("lualine").refresh()
-augroup END
let g:loaded_netrw = 1
let g:loaded_netrwPlugin = 1
@@ -237,6 +241,9 @@ augroup UseTerminal
augroup END
+let g:jq_highlight_objects = 1
+let g:jq_highlight_function_calls = 1
+
lua << EOF
function open_terminal_on_directory()
@@ -270,14 +277,6 @@ lua << EOF
-- CiderLSP
vim.opt.completeopt = { "menu", "menuone", "noselect" }
- require("lualine").setup({
- sections = {
- lualine_a = { "mode" },
- lualine_b = { "filename" },
- lualine_c = {
- }
- }
- })
require("lsp")
require("lspconfig")
require("tabby")
@@ -288,6 +287,7 @@ lua << EOF
hijack_directories = {auto_open = false}
})
require("treesitter-textobjects-setup")
+ require("lualinesetup")
require('telescope').setup({
defaults = {
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 9332795..4c0fb66 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -2,15 +2,16 @@ local vim = assert(vim)
local nvim_lsp = require("lspconfig")
-nvim_lsp.perlpls.setup {}
-nvim_lsp.lua_ls.setup {}
-nvim_lsp.clangd.setup {}
nvim_lsp.bashls.setup {}
+nvim_lsp.clangd.setup {}
+nvim_lsp.jqls.setup {}
+nvim_lsp.lua_ls.setup {}
+nvim_lsp.ocamllsp.setup {}
+nvim_lsp.perlpls.setup {}
nvim_lsp.rust_analyzer.setup {}
+nvim_lsp.verible.setup {}
nvim_lsp.vimls.setup {}
nvim_lsp.zls.setup {}
-nvim_lsp.ocamllsp.setup {}
-nvim_lsp.verible.setup {}
nvim_lsp.hls.setup {
settings = {
haskell = {
diff --git a/lua/lualinesetup.lua b/lua/lualinesetup.lua
new file mode 100644
index 0000000..16e0cce
--- /dev/null
+++ b/lua/lualinesetup.lua
@@ -0,0 +1,42 @@
+local vim = assert(vim)
+
+-- LSP clients attached to buffer
+local clients_lsp = function()
+ local bufnr = vim.api.nvim_get_current_buf()
+
+ local clients = vim.lsp.buf_get_clients(bufnr)
+ if next(clients) == nil then
+ return ''
+ end
+
+ local c = {}
+ for _, client in pairs(clients) do
+ table.insert(c, client.name)
+ end
+ return '\u{f085} ' .. table.concat(c, ',')
+end
+
+local config = {
+ options = {
+ theme = 'meltdown',
+ component_separators = '‣', -- '┃'
+ section_separators = '',
+ },
+ sections = {
+ lualine_a = { 'mode' },
+ lualine_b = { 'branch', 'diff', 'diagnostics' },
+ lualine_c = { 'filename' },
+
+ -- right
+ lualine_x = {
+ { clients_lsp, color = { fg = '#80a0ff' } },
+ { 'encoding', color = { fg = '#80a0ff' } },
+ { 'fileformat', color = { fg = '#ffb700' } },
+ { 'filetype', color = { fg = '#80a0ff' } },
+ },
+ lualine_y = { 'progress' },
+ lualine_z = { 'location' }
+ },
+}
+
+require("lualine").setup(config)