mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-11-06 03:12:24 +00:00
Fix vim
This commit is contained in:
elkowar
parent
c91f0271ef
commit
3221324964
8 changed files with 48 additions and 24 deletions
|
|
@ -34,7 +34,6 @@ in
|
|||
|
||||
|
||||
sxhkd
|
||||
okular
|
||||
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@
|
|||
"a" (cmd "Lspsaga show_line_diagnostics" "Line diagnostics")
|
||||
"h" (cmd "RustToggleInlayHints" "Toggle inlay hints")
|
||||
"r" (cmd "Trouble lsp_references" "Show references")
|
||||
"E" (cmd "Trouble lsp_document_diagnostics" "List diagnostics")
|
||||
"e" (cmd "Trouble lsp_workspace_diagnostics" "Show diagnostics")
|
||||
"E" (cmd "Trouble document_diagnostics" "List diagnostics")
|
||||
"e" (cmd "Trouble workspace_diagnostics" "Show diagnostics")
|
||||
"t" (cmd "Trouble lsp_type_definitions" "Go to type-definition")
|
||||
"i" (cmd "Trouble lsp_implementations" "Show implementation")
|
||||
"g" (cmd "Trouble lsp_definitions" "Go to definition")
|
||||
|
|
|
|||
|
|
@ -34,7 +34,10 @@
|
|||
|
||||
:github/copilot.vim {:opt true :cmd ["Copilot"]}
|
||||
|
||||
:lervag/vimtex (cfg "dots.plugins.vimtex" {:opt true :ft ["tex"]})
|
||||
:lervag/vimtex {:opt false
|
||||
:cmd ["VimtexInverseSearch"]
|
||||
:setup #(require :dots.plugins.vimtex)}
|
||||
|
||||
:brymer-meneses/grammar-guard.nvim {:opt false
|
||||
:requires ["williamboman/nvim-lsp-installer"
|
||||
"neovim/nvim-lspconfig"]}
|
||||
|
|
@ -125,12 +128,9 @@
|
|||
;:elkowar/trouble.nvim {:config #(require "dots.plugins.trouble")
|
||||
;:cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]
|
||||
|
||||
"/home/leon/coding/prs/trouble.nvim" {:opt false :config #(require "dots.plugins.trouble")
|
||||
:folke/lsp-trouble.nvim {:opt false :config #(require "dots.plugins.trouble")
|
||||
:cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]}
|
||||
|
||||
;:folke/lsp-trouble.nvim {:opt false :config #(require "dots.plugins.trouble")
|
||||
;:cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]}
|
||||
|
||||
:simrat39/symbols-outline.nvim {:opt false :config #(require "dots.plugins.symbols-outline")}
|
||||
|
||||
:neovim/nvim-lspconfig {}
|
||||
|
|
@ -148,6 +148,8 @@
|
|||
|
||||
; cmp <<<
|
||||
:hrsh7th/vim-vsnip {}
|
||||
:hrsh7th/vim-vsnip-integ {}
|
||||
:rafamadriz/friendly-snippets {}
|
||||
|
||||
:hrsh7th/cmp-vsnip {}
|
||||
:hrsh7th/cmp-nvim-lsp {}
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
:mapping {:<C-d> (cmp.mapping.scroll_docs -4)
|
||||
:<C-f> (cmp.mapping.scroll_docs 4)
|
||||
:<C-space> (cmp.mapping.complete)
|
||||
:<esc> #(do (cmp.mapping.close) (vim.cmd "stopinsert"))}
|
||||
;:<CR> (cmp.mapping.confirm {:select true})}
|
||||
:<esc> #(do (cmp.mapping.close) (vim.cmd "stopinsert"))
|
||||
:<CR> (cmp.mapping.confirm {:select true})}
|
||||
|
||||
:experimental {:custom_menu true}
|
||||
|
||||
|
|
@ -47,4 +47,6 @@
|
|||
cmp.config.compare.length
|
||||
cmp.config.compare.order]}})
|
||||
|
||||
(cmp.setup.cmdline "/" {:sources [{:name :buffer}]})
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@
|
|||
(or-empty (str.join " | " s))))
|
||||
|
||||
(defn lsp-diagnostic-component [kind color]
|
||||
{:enabled #(~= 0 (vim.lsp.diagnostic.get_count 0 kind))
|
||||
:provider #(spaces (vim.lsp.diagnostic.get_count 0 kind))
|
||||
{:enabled #(~= 0 (length (vim.diagnostic.get 0 {:severity kind})))
|
||||
:provider #(spaces (length (vim.diagnostic.get 0 {:severity kind})))
|
||||
:left_sep ""
|
||||
:right_sep ""
|
||||
:hl {:fg bar-bg :bg color}})
|
||||
|
|
@ -95,20 +95,20 @@
|
|||
|
||||
(tset components.active 3
|
||||
[{:provider vim.bo.filetype :right_sep " " :hl #(vim-mode-hl true)}
|
||||
(lsp-diagnostic-component "Information" colors.neutral_green)
|
||||
(lsp-diagnostic-component "Hint" colors.neutral_aqua)
|
||||
(lsp-diagnostic-component "Warning" colors.neutral_yellow)
|
||||
(lsp-diagnostic-component "Error" colors.neutral_red)
|
||||
(lsp-diagnostic-component vim.diagnostic.severity.INFO colors.neutral_green)
|
||||
(lsp-diagnostic-component vim.diagnostic.severity.HINT colors.neutral_aqua)
|
||||
(lsp-diagnostic-component vim.diagnostic.severity.WARN colors.neutral_yellow)
|
||||
(lsp-diagnostic-component vim.diagnostic.severity.ERROR colors.neutral_red)
|
||||
{:provider coordinates :hl #(vim-mode-hl false)}])
|
||||
|
||||
(tset components.inactive 1
|
||||
[{:provider inactive-separator-provider
|
||||
:hl {:bg "NONE" :fg horiz-separator-color}}])
|
||||
|
||||
(feline.setup
|
||||
{:colors {:fg colors.dark4 :bg colors.dark0}
|
||||
:default_hl {:inactive
|
||||
{:fg horiz-separator-color
|
||||
:bg "NONE"}}
|
||||
|
||||
|
||||
(utils.highlight-add :StatusLineNC {:bg "NONE" :fg colors.light1})
|
||||
|
||||
(feline.setup {:theme {:fg colors.light1 :bg colors.dark0}
|
||||
:components components})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,18 @@
|
|||
(module dots.plugins.vimtex)
|
||||
|
||||
(set vim.g.vimtex_view_method "general")
|
||||
(set vim.g.vimtex_view_general_viewer "okular")
|
||||
(set vim.g.vimtex_view_general_options "--unique file:@pdf#src:@line@tex")
|
||||
|
||||
(set vim.g.vimtex_syntax_conceal {:accents 1
|
||||
:cites 1
|
||||
:fancy 1
|
||||
:greek 1
|
||||
:math_bounds 1
|
||||
:math_delimiters 1
|
||||
:math_fracs 1
|
||||
:math_super_sub 1
|
||||
:math_symbols 1
|
||||
:sections 0
|
||||
:styles 0})
|
||||
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@
|
|||
(vim.cmd "autocmd! TextYankPost * silent! lua vim.highlight.on_yank {higroup=\"IncSearch\", timeout=300}")
|
||||
|
||||
|
||||
(set vim.g.copilot_filetypes {:TelescopePrompt false})
|
||||
|
||||
|
||||
; foldend
|
||||
|
|
@ -128,6 +129,7 @@
|
|||
|
||||
|
||||
|
||||
|
||||
(vim.fn.sign_define :LspDiagnosticsSignError {:text "◆"})
|
||||
(vim.fn.sign_define :LspDiagnosticsSignWarning {:text "◆"})
|
||||
(vim.fn.sign_define :LspDiagnosticsSignHint {:text "◆"})
|
||||
|
|
|
|||
|
|
@ -591,7 +591,11 @@ myActivateManageHook = pure mempty
|
|||
|
||||
mySwallowEventHook = WindowSwallowing.swallowEventHook
|
||||
(className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar")
|
||||
((not <$> (className =* "eww" <||> className =? "Dragon" <||> className =? "noswallow")) <||> className =? "re") -- remove that last part
|
||||
(not <$> foldl1 (<||>) [ className =* "eww"
|
||||
, className =? "Dragon"
|
||||
, className =? "okular"
|
||||
, className =? "noswallow"
|
||||
])
|
||||
|
||||
|
||||
(=*) :: Query String -> String -> Query Bool
|
||||
|
|
|
|||
Loading…
Reference in a new issue