mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-12-23 21:12:22 +00:00
Add bufferline
This commit is contained in:
elkowar
parent
c45855021f
commit
01158f6a26
4 changed files with 226 additions and 176 deletions
211
fnl/init.fnl
211
fnl/init.fnl
|
|
@ -3,9 +3,13 @@
|
|||
fennel aniseed.fennel
|
||||
nvim aniseed.nvim
|
||||
kb keybinds
|
||||
utils utils}
|
||||
utils utils
|
||||
gl plugins.galaxyline
|
||||
lsp plugins.lsp}
|
||||
require-macros [macros]})
|
||||
;include {keybinds keybinds}})
|
||||
;include {keybinds keybinds }})
|
||||
|
||||
(local colors (utils.colors))
|
||||
|
||||
(global pp
|
||||
(fn [x]
|
||||
|
|
@ -14,180 +18,35 @@
|
|||
(set nvim.g.conjure#client#fennel#aniseed#aniseed_module_prefix "aniseed.")
|
||||
|
||||
|
||||
(local lsp (require "lspconfig"))
|
||||
(local saga (require "lspsaga"))
|
||||
(local compe (require "compe"))
|
||||
|
||||
(local bufferline (require "bufferline"))
|
||||
|
||||
(fn on_attach [client bufnr]
|
||||
(if client.resolved_capabilities.document_highlight
|
||||
(nvim.api.nvim_exec
|
||||
"hi LspReferenceRead cterm=bold ctermbg=red guibg='#8ec07c' guifg='#282828' hi LspReferenceText cterm=bold ctermbg=red guibg='#8ec07c' guifg='#282828' hi LspReferenceWrite cterm=bold ctermbg=red guibg='#8ec07c' guifg='#282828'
|
||||
augroup lsp_document_highlight
|
||||
autocmd! * <buffer> autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight() autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
|
||||
augroup END " false)))
|
||||
; :h bufferline-lua-highlights
|
||||
(let [selected { :guibg colors.neutral_aqua :guifg colors.dark0 :gui ""}
|
||||
visible { :guibg colors.dark1 :guifg colors.neutral_aqua :gui ""}]
|
||||
(bufferline.setup
|
||||
{ :options
|
||||
{ :diagnostics "nvim_lsp"
|
||||
:diagnostics_indicator (fn [cnt lvl diagnostics-dict] (.. " (" cnt ")"))
|
||||
:show_buffer_close_icons false
|
||||
:show_close_icon false
|
||||
:show_tab_indicators false
|
||||
:enforce_regular_tabs false
|
||||
:tab_size 10}
|
||||
|
||||
;(fn on_attach [client bufnr] (print "hi"))
|
||||
|
||||
|
||||
(lsp.rust_analyzer.setup { :on_attach on_attach})
|
||||
(lsp.jsonls.setup { :on_attach on_attach})
|
||||
(lsp.vimls.setup { :on_attach on_attach})
|
||||
(lsp.tsserver.setup { :on_attach on_attach})
|
||||
(lsp.bashls.setup { :on_attach on_attach})
|
||||
(lsp.html.setup { :on_attach on_attach})
|
||||
|
||||
(lsp.denols.setup { :on_attach on_attach
|
||||
:root_dir (lsp.util.root_pattern ".git")})
|
||||
(lsp.hls.setup { :on_attach on_attach}
|
||||
:settings { :languageServerHaskell { :formattingProvider "stylish-haskell"}})
|
||||
|
||||
(compe.setup
|
||||
{ :enabled true
|
||||
:autocomplete false
|
||||
:debug false
|
||||
:min_length 1
|
||||
:preselect "enable"
|
||||
:throttle_time 80
|
||||
:source_timeout 200
|
||||
:incomplete_delay 400
|
||||
:max_abbr_width 100
|
||||
:max_kind_width 100
|
||||
:max_menu_width 100
|
||||
:documentation true
|
||||
:source { :path true
|
||||
:buffer true
|
||||
:calc true
|
||||
:nvim_lsp true
|
||||
:nvim_lua true
|
||||
:vsnip false}})
|
||||
|
||||
|
||||
(saga.init_lsp_saga
|
||||
{ :border_style 1
|
||||
:code_action_keys { :quit "<esc>" :exec "<CR>"}
|
||||
:rename_action_keys { :quit "<esc>" :exec "<CR>"}
|
||||
:finder_action_keys { :quit "<esc>"
|
||||
:open "<CR>"
|
||||
:vsplit "v"
|
||||
:split "b"
|
||||
:scroll_up "<C-u>"
|
||||
:scroll_down "<C-d>"}})
|
||||
|
||||
|
||||
|
||||
(local galaxyline (require "galaxyline"))
|
||||
(local gl-condition (require "galaxyline.condition"))
|
||||
(local gl-fileinfo (require "galaxyline.provider_fileinfo"))
|
||||
(local gl-diagnostic (require "galaxyline.provider_diagnostic"))
|
||||
(local gl-vcs (require "galaxyline.provider_vcs"))
|
||||
(local colors (utils.colors))
|
||||
|
||||
(local modes
|
||||
{ :n { :text "NORMAL" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:i { :text "INSERT" :colors { :bg colors.neutral_yellow :fg colors.dark0}}
|
||||
:c { :text "CMD" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:ce { :text "NORMEX" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:cv { :text "EX" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:ic { :text "INSCOMP" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:no { :text "OP-PENDING" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:r { :text "HIT-ENTER" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:r? { :text "CONFIRM" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:R { :text "REPLACE" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:Rv { :text "VIRTUAL" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:s { :text "SELECT" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:S { :text "SELECT" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:t { :text "TERM" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:v { :text "VISUAL" :colors { :bg colors.neutral_blue :fg colors.dark0}}
|
||||
:V { :text "VISUAL LINE" :colors { :bg colors.neutral_blue :fg colors.dark0}}
|
||||
"" { :text "VISUAL BLOCK" :colors { :bg colors.neutral_blue :fg colors.dark0}}})
|
||||
|
||||
|
||||
|
||||
|
||||
(fn get-mode-data []
|
||||
(or (. modes (nvim.fn.mode))
|
||||
{ :text (nvim.fn.mode)
|
||||
:colors {:bg colors.neutral_orange :fg colors.dark0}}))
|
||||
|
||||
(fn buf-empty? []
|
||||
(= 1 (nvim.fn.empty (nvim.fn.expand "%:t"))))
|
||||
|
||||
(fn checkwidth []
|
||||
(and (< 35 (/ (nvim.fn.winwidth 0) 2))
|
||||
(not buf-empty?)))
|
||||
|
||||
|
||||
(fn file-readonly-or-help? []
|
||||
(and nvim.bo.readonly (~= nvim.bo.filetype "help")))
|
||||
|
||||
|
||||
(fn get-current-file-name []
|
||||
(let [file (nvim.fn.expand "%:t")]
|
||||
(if
|
||||
(= 1 (nvim.fn.empty file)) ""
|
||||
(file-readonly-or-help?) (.. "RO " file)
|
||||
(and nvim.bo.modifiable nvim.bo.modified) (.. file " ")
|
||||
file)))
|
||||
|
||||
|
||||
(utils.highlight "StatusLine" {:bg colors.dark1 :fg colors.light0})
|
||||
(set galaxyline.short_line_list ["dbui" "diff" "peekaboo" "undotree" "vista" "vista_markdown"])
|
||||
|
||||
|
||||
(set galaxyline.section.left
|
||||
[ { :ViMode { :provider
|
||||
(fn []
|
||||
(let [modedata (get-mode-data)]
|
||||
(utils.highlight "GalaxyViMode" modedata.colors)
|
||||
(.. " " modedata.text " ")))}}
|
||||
|
||||
{ :FileName { :provider get-current-file-name
|
||||
:highlight [colors.light4 colors.dark1]}}
|
||||
{ :Space { :provider (fn [] "")
|
||||
:highlight [colors.light0 colors.dark1]}}])
|
||||
|
||||
|
||||
(fn provider-lsp-diag [kind]
|
||||
(fn []
|
||||
(let [n (vim.lsp.diagnostic.get_count 0 kind)]
|
||||
(if
|
||||
(= n 0) ""
|
||||
(.. " " n " ")))))
|
||||
|
||||
(set galaxyline.section.right
|
||||
[ { :GitBranch { :provider (fn []
|
||||
(let [branch (gl-vcs.get_git_branch)]
|
||||
(if (= "master" branch) "" branch)))
|
||||
:highlight [colors.light4 colors.dark1]}}
|
||||
{ :FileType { :provider (fn [] nvim.bo.filetype)
|
||||
:highlight [colors.neutral_aqua colors.dark1]}}
|
||||
|
||||
{ :DiagnosticInfo { :provider (provider-lsp-diag "Info")
|
||||
:highlight [colors.dark1 colors.neutral_blue]}}
|
||||
{ :DiagnosticWarn { :provider (provider-lsp-diag "Warning")
|
||||
:highlight [colors.dark1 colors.neutral_yellow]
|
||||
:separator ""}}
|
||||
{ :DiagnosticError { :provider (provider-lsp-diag "Error")
|
||||
:highlight [colors.dark1 colors.bright_red]
|
||||
:separator ""}}
|
||||
{ :LineInfo { :provider (fn [] (.. " " (gl-fileinfo.line_column) " "))
|
||||
:highlight "GalaxyViMode"
|
||||
:separator ""}}])
|
||||
|
||||
|
||||
|
||||
|
||||
(do
|
||||
(fn add-segment-defaults [data]
|
||||
(a.merge { :highlight [colors.light0 colors.dark1]
|
||||
:separator " "
|
||||
:separator_highlight "StatusLine"}
|
||||
data))
|
||||
|
||||
(fn map-gl-section [f section]
|
||||
(icollect [_ elem (ipairs section)]
|
||||
(collect [k v (pairs elem)] (values k (f v)))))
|
||||
|
||||
(set galaxyline.section.left (map-gl-section add-segment-defaults galaxyline.section.left))
|
||||
(set galaxyline.section.right (map-gl-section add-segment-defaults galaxyline.section.right)))
|
||||
:highlights
|
||||
{ :fill { :guibg colors.dark0 :guifg colors.light0}
|
||||
:background visible
|
||||
:buffer_visible visible
|
||||
:buffer_selected selected
|
||||
:modified visible
|
||||
:modified_visible visible
|
||||
:modified_selected selected
|
||||
:error visible
|
||||
:error_selected selected
|
||||
:error_visible visible
|
||||
:warning visible
|
||||
:warning_selected selected
|
||||
:warning_visible visible
|
||||
:separator visible
|
||||
:indicator_selected {:guibg colors.neutral_aqua :guifg colors.neutral_aqua}}}))
|
||||
|
|
|
|||
119
fnl/plugins/galaxyline.fnl
Normal file
119
fnl/plugins/galaxyline.fnl
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
(module plugins.galaxyline
|
||||
{require {a aniseed.core
|
||||
fennel aniseed.fennel
|
||||
nvim aniseed.nvim
|
||||
utils utils
|
||||
|
||||
galaxyline galaxyline
|
||||
gl-condition galaxyline.condition
|
||||
gl-fileinfo galaxyline.provider_fileinfo
|
||||
gl-diagnostic galaxyline.provider_diagnostic
|
||||
gl-vcs galaxyline.provider_vcs}
|
||||
|
||||
require-macros [macros]})
|
||||
|
||||
(local colors (utils.colors))
|
||||
|
||||
(local modes
|
||||
{ :n { :text "NORMAL" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:i { :text "INSERT" :colors { :bg colors.neutral_yellow :fg colors.dark0}}
|
||||
:c { :text "CMD" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:ce { :text "NORMEX" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:cv { :text "EX" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:ic { :text "INSCOMP" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:no { :text "OP-PENDING" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:r { :text "HIT-ENTER" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:r? { :text "CONFIRM" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:R { :text "REPLACE" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:Rv { :text "VIRTUAL" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:s { :text "SELECT" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:S { :text "SELECT" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:t { :text "TERM" :colors { :bg colors.neutral_aqua :fg colors.dark0}}
|
||||
:v { :text "VISUAL" :colors { :bg colors.neutral_blue :fg colors.dark0}}
|
||||
:V { :text "VISUAL LINE" :colors { :bg colors.neutral_blue :fg colors.dark0}}
|
||||
"" { :text "VISUAL BLOCK" :colors { :bg colors.neutral_blue :fg colors.dark0}}})
|
||||
|
||||
|
||||
|
||||
(fn get-mode-data []
|
||||
(or (. modes (nvim.fn.mode))
|
||||
{ :text (nvim.fn.mode)
|
||||
:colors {:bg colors.neutral_orange :fg colors.dark0}}))
|
||||
|
||||
(fn buf-empty? []
|
||||
(= 1 (nvim.fn.empty (nvim.fn.expand "%:t"))))
|
||||
|
||||
(fn checkwidth []
|
||||
(and (< 35 (/ (nvim.fn.winwidth 0) 2))
|
||||
(not buf-empty?)))
|
||||
|
||||
|
||||
(fn get-current-file-name []
|
||||
(let [file (nvim.fn.expand "%:t")]
|
||||
(if
|
||||
(= 1 (nvim.fn.empty file)) ""
|
||||
nvim.bo.readonly (.. "RO " file)
|
||||
(and nvim.bo.modifiable nvim.bo.modified) (.. file " ")
|
||||
file)))
|
||||
|
||||
|
||||
(utils.highlight "StatusLine" {:bg colors.dark1 :fg colors.light0 })
|
||||
(set galaxyline.short_line_list ["dbui" "diff" "peekaboo" "undotree" "vista" "vista_markdown"])
|
||||
|
||||
|
||||
(set galaxyline.section.left
|
||||
[ { :ViMode { :provider
|
||||
(fn []
|
||||
(let [modedata (get-mode-data)]
|
||||
(utils.highlight "GalaxyViMode" modedata.colors)
|
||||
(.. " " modedata.text " "))) }}
|
||||
|
||||
{ :FileName { :provider get-current-file-name
|
||||
:highlight [colors.light4 colors.dark1] }}
|
||||
{ :Space { :provider (fn [] "")
|
||||
:highlight [colors.light0 colors.dark1] }}])
|
||||
|
||||
|
||||
(fn provider-lsp-diag [kind]
|
||||
(fn []
|
||||
(let [n (vim.lsp.diagnostic.get_count 0 kind)]
|
||||
(if
|
||||
(= n 0) ""
|
||||
(.. " " n " ")))))
|
||||
|
||||
(set galaxyline.section.right
|
||||
[ { :GitBranch { :provider (fn []
|
||||
(let [branch (gl-vcs.get_git_branch)]
|
||||
(if (= "master" branch) "" branch)))
|
||||
:highlight [colors.light4 colors.dark1] }}
|
||||
{ :FileType { :provider (fn [] nvim.bo.filetype)
|
||||
:highlight [colors.neutral_aqua colors.dark1] }}
|
||||
|
||||
{ :DiagnosticInfo { :provider (provider-lsp-diag "Info")
|
||||
:highlight [colors.dark1 colors.neutral_blue] }}
|
||||
{ :DiagnosticWarn { :provider (provider-lsp-diag "Warning")
|
||||
:highlight [colors.dark1 colors.neutral_yellow]
|
||||
:separator "" }}
|
||||
{ :DiagnosticError { :provider (provider-lsp-diag "Error")
|
||||
:highlight [colors.dark1 colors.bright_red]
|
||||
:separator "" }}
|
||||
{ :LineInfo { :provider (fn [] (.. " " (gl-fileinfo.line_column) " "))
|
||||
:highlight "GalaxyViMode"
|
||||
:separator "" }}])
|
||||
|
||||
|
||||
|
||||
|
||||
(do
|
||||
(fn add-segment-defaults [data]
|
||||
(a.merge { :highlight [colors.light0 colors.dark1]
|
||||
:separator " "
|
||||
:separator_highlight "StatusLine"}
|
||||
data))
|
||||
|
||||
(fn map-gl-section [f section]
|
||||
(icollect [_ elem (ipairs section)]
|
||||
(collect [k v (pairs elem)] (values k (f v)))))
|
||||
|
||||
(set galaxyline.section.left (map-gl-section add-segment-defaults galaxyline.section.left))
|
||||
(set galaxyline.section.right (map-gl-section add-segment-defaults galaxyline.section.right)))
|
||||
70
fnl/plugins/lsp.fnl
Normal file
70
fnl/plugins/lsp.fnl
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
(module plugins.lsp
|
||||
{require {a aniseed.core
|
||||
fennel aniseed.fennel
|
||||
nvim aniseed.nvim
|
||||
lsp lspconfig
|
||||
saga lspsaga
|
||||
compe compe}
|
||||
|
||||
|
||||
require-macros [macros]})
|
||||
|
||||
|
||||
(fn on_attach [client bufnr]
|
||||
(if client.resolved_capabilities.document_highlight
|
||||
(vim.api.nvim_exec
|
||||
"hi LspReferenceRead cterm=bold ctermbg=red guibg='#8ec07c' guifg='#282828'
|
||||
hi LspReferenceText cterm=bold ctermbg=red guibg='#8ec07c' guifg='#282828'
|
||||
hi LspReferenceWrite cterm=bold ctermbg=red guibg='#8ec07c' guifg='#282828'
|
||||
augroup lsp_document_highlight
|
||||
autocmd! * <buffer>
|
||||
autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
|
||||
autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
|
||||
augroup END"
|
||||
false)))
|
||||
|
||||
|
||||
(lsp.rust_analyzer.setup { :on_attach on_attach })
|
||||
(lsp.jsonls.setup { :on_attach on_attach })
|
||||
(lsp.vimls.setup { :on_attach on_attach })
|
||||
(lsp.tsserver.setup { :on_attach on_attach })
|
||||
(lsp.bashls.setup { :on_attach on_attach })
|
||||
(lsp.html.setup { :on_attach on_attach })
|
||||
|
||||
(lsp.denols.setup { :on_attach on_attach
|
||||
:root_dir (lsp.util.root_pattern ".git") })
|
||||
(lsp.hls.setup { :on_attach on_attach }
|
||||
:settings { :languageServerHaskell { :formattingProvider "stylish-haskell" }})
|
||||
|
||||
(compe.setup
|
||||
{ :enabled true
|
||||
:autocomplete false
|
||||
:debug false
|
||||
:min_length 1
|
||||
:preselect "enable"
|
||||
:throttle_time 80
|
||||
:source_timeout 200
|
||||
:incomplete_delay 400
|
||||
:max_abbr_width 100
|
||||
:max_kind_width 100
|
||||
:max_menu_width 100
|
||||
:documentation true
|
||||
:source { :path true
|
||||
:buffer true
|
||||
:calc true
|
||||
:nvim_lsp true
|
||||
:nvim_lua true
|
||||
:vsnip false }})
|
||||
|
||||
|
||||
(saga.init_lsp_saga
|
||||
{ :border_style 1
|
||||
:code_action_keys { :quit "<esc>" :exec "<CR>"}
|
||||
:rename_action_keys { :quit "<esc>" :exec "<CR>"}
|
||||
:finder_action_keys { :quit "<esc>"
|
||||
:open "<CR>"
|
||||
:vsplit "v"
|
||||
:split "b"
|
||||
:scroll_up "<C-u>"
|
||||
:scroll_down "<C-d>"}})
|
||||
|
||||
|
|
@ -7,6 +7,8 @@ endif
|
|||
|
||||
call plug#begin('~/.vim/plugged')
|
||||
|
||||
Plug 'akinsho/nvim-bufferline.lua'
|
||||
|
||||
Plug 'Olical/aniseed', { 'tag': 'v3.16.0' }
|
||||
Plug 'bakpakin/fennel.vim'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue