ElKowar/dots-of-war
1
0
Fork 0
mirror of https://github.com/elkowar/dots-of-war.git synced 2024-12-24 13:22:23 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity

more cleanup

Browse source
This commit is contained in:
elkowar 2021-05-08 20:51:05 +02:00
parent a86abb6e56
commit 7256f19a47
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
10 changed files with 144 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
files/.config/nvim/fnl/init.fnl
View file

@ -1,10 +1,9 @@
(module init
{require {utils utils
str aniseed.string
nvim aniseed.nvim
a aniseed.core
fennel aniseed.fennel
colors colors}
{autoload {utils utils
nvim aniseed.nvim
a aniseed.core
fennel aniseed.fennel
colors colors}
require-macros [macros]})
(macro make-errors-epic [f]
@ -28,36 +27,10 @@
; foldend
; Treesitter ------------------------------------------------------- foldstart
(pkg nvim-treesitter [configs (require "nvim-treesitter.configs")]
(configs.setup
{:ensure_installed "all"
:highlight {:enable true
:disable ["fennel"]}
;:indent {:enable true}
;:disable ["lua"]}
:incremental_selection
{:enable true
:keymaps {:init_selection "gss"
:node_incremental "gsl"
:node_decremental "gsh"
:scope_incremental "gsj"
:scope_decremental "gsk"}}
; disabled due to it fucking with gitsigns.nvim
;:rainbow { :enable true
;:extended_mode true}
:context_commentstring {:enable true}}))
;(nvim-biscuits.setup {}
;{ :on_events ["InsertLeave" "CursorHoldI"]})
; foldend
; :: and _ as space ------------------------------------------------------------------- foldstart
(var remapped-space nil)
(fn _G.RebindShit [newKey]

5
files/.config/nvim/fnl/macros.fnl
View file

@ -26,9 +26,8 @@
:pkg
(fn [name mappings ...]
;(if (~= nil (. packer_plugins `,(tostring name)))
(if true
`(let ,mappings ,...)
`(if (~= nil (. packer_plugins `,(tostring name)))
(let ,mappings ,...)
(print (.. "plugin disabled " `,(tostring name)))))
:each-pair

12
files/.config/nvim/fnl/plugins.fnl
View file

@ -5,7 +5,7 @@
:nvim-telescope/telescope.nvim {:mod "plugins.telescope"
:requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim]}
:p00f/nvim-ts-rainbow {}
:p00f/nvim-ts-rainbow {:mod "plugins.treesitter"}
:romgrk/nvim-treesitter-context {}
:JoosepAlviste/nvim-ts-context-commentstring {}
:nvim-treesitter/nvim-treesitter {:run ":TSUpdate"}
@ -56,11 +56,11 @@
; code-related ----------------------------------------- <<<
:folke/lsp-trouble.nvim {}
:simrat39/symbols-outline.nvim {}
:folke/lsp-trouble.nvim {:mod "plugins.trouble"}
:simrat39/symbols-outline.nvim {:mod "plugins.symbols-outline"}
:neovim/nvim-lspconfig {}
:hrsh7th/nvim-compe {}
:glepnir/lspsaga.nvim {}
:hrsh7th/nvim-compe {:mod "plugins.compe"}
:glepnir/lspsaga.nvim {:mod "plugins.lspsaga"}
:Olical/conjure {}
@ -74,7 +74,7 @@
:editorconfig/editorconfig-vim {}
:honza/vim-snippets {}
:tommcdo/vim-exchange {}
:kien/rainbow_parentheses.vim {}
;:frazrepo/vim-rainbow {}
:bhurlow/vim-parinfer {:ft ["fennel" "carp" "lisp" "elisp"]}

24
files/.config/nvim/fnl/plugins/compe.fnl Normal file
View file

@ -0,0 +1,24 @@
(module plugins.compe
{autoload {compe compe}})
(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
:conjure true}})

118
files/.config/nvim/fnl/plugins/lsp.fnl
View file

@ -1,23 +1,14 @@
(module plugins.lsp
{require {a aniseed.core
fennel aniseed.fennel
nvim aniseed.nvim
lsp lspconfig
lsp-configs lspconfig.configs
utils utils
colors colors}
utils utils}
require-macros [macros]})
(pkg symbols-outline.nvim [symbols-outline (require "symbols-outline")]
(symbols-outline.setup { :highlight_hovered_item true :show_guides true}))
; LSP config -------------------------------------------------------------------------------- <<<<<
(fn on_attach [client bufnr]
(pkg lsp_signature.nvim [lsp_signature (require "lsp_signature")]
(pkg lsp-signature.nvim [lsp_signature (require "lsp_signature")]
(lsp_signature.on_attach))
(if client.resolved_capabilities.document_highlight
@ -48,8 +39,6 @@
((. lsp lsp-name :setup) merged-opts)))
(let [capabilities (vim.lsp.protocol.make_client_capabilities)]
(set capabilities.textDocument.completion.completionItem.snippetSupport true)
(set capabilities.textDocument.completion.completionItem.resolveSupport
@ -75,107 +64,6 @@
;(lsp.vimls.setup { :on_attach on_attach})
; >>>>>
; compe -------------------------------------------------------------------------------- <<<<<
(pkg nvim-compe [compe (require "compe")]
(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
:conjure true}}))
; >>>>>
; LSP saga -------------------------------------------------------------------------------- <<<<<
(pkg lspsaga.nvim [saga (require "lspsaga")]
(saga.init_lsp_saga
{:border_style "single" ; single double round plus
:code_action_prompt {:enable true
:sign true
:virtual_text false}
: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>"}})
(utils.highlight ["LspFloatWinBorder"
"LspSagaHoverBorder"
"LspSagaRenameBorder"
"LspSagaSignatureHelpBorder"
"LspSagaCodeActionBorder"
"LspSagaDefPreviewBorder"
"LspSagaDiagnosticBorder"]
{:bg colors.dark0_hard :fg colors.dark0_hard})
(utils.highlight ["LspSagaDiagnosticTruncateLine"
"LspSagaDocTruncateLine"
"LspSagaShTruncateLine"]
{:bg "NONE" :fg colors.dark0})
(utils.highlight ["TargetWord"
"LspSagaCodeActionTitle"
"LspSagaBorderTitle"
"LspSagaCodeActionContent"
"LspSagaFinderSelection"
"LspSagaDiagnosticHeader"]
{:fg colors.bright_aqua}))
(utils.highlight "LspFloatWinNormal" {:bg colors.dark0_hard})
(utils.highlight "LspFloatWinBorder" {:bg colors.dark0_hard
:fg colors.dark0_hard})
(utils.highlight "TargetWord" {:fg colors.bright_aqua})
; >>>>>
; LSP trouble -------------------------------------------------------------------------------- <<<<<
(pkg lsp-trouble.nvim [trouble (require "trouble")]
(trouble.setup
{:icons false
:auto_preview true
:auto_close true
:auto_open false
:action_keys
{:jump "o"
:jump_close "<CR>"
:close "<esc>"
:cancel "q"
:hover ["a" "K"]}})
(utils.highlight "LspTroubleFoldIcon" {:bg "NONE" :fg colors.bright_orange})
(utils.highlight "LspTroubleCount" {:bg "NONE" :fg colors.bright_green})
(utils.highlight "LspTroubleText" {:bg "NONE" :fg colors.light0})
(utils.highlight "LspTroubleSignError" {:bg "NONE" :fg colors.bright_red})
(utils.highlight "LspTroubleSignWarning" {:bg "NONE" :fg colors.bright_yellow})
(utils.highlight "LspTroubleSignInformation" {:bg "NONE" :fg colors.bright_aqua})
(utils.highlight "LspTroubleSignHint" {:bg "NONE" :fg colors.bright_blue}))
; >>>>>
; Empty template -------------------------------------------------------------------------------- <<<<<
; >>>>>
(set vim.o.signcolumn "yes")

49
files/.config/nvim/fnl/plugins/lspsaga.fnl Normal file
View file

@ -0,0 +1,49 @@
(module plugins.lspsaga
{autoload {utils utils
colors colors
saga lspsaga}})
(saga.init_lsp_saga
{:border_style "single" ; single double round plus
:code_action_prompt {:enable true
:sign true
:virtual_text false}
: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>"}})
(utils.highlight ["LspFloatWinBorder"
"LspSagaHoverBorder"
"LspSagaRenameBorder"
"LspSagaSignatureHelpBorder"
"LspSagaCodeActionBorder"
"LspSagaDefPreviewBorder"
"LspSagaDiagnosticBorder"]
{:bg colors.dark0_hard :fg colors.dark0_hard})
(utils.highlight ["LspSagaDiagnosticTruncateLine"
"LspSagaDocTruncateLine"
"LspSagaShTruncateLine"]
{:bg "NONE" :fg colors.dark0})
(utils.highlight ["TargetWord"
"LspSagaCodeActionTitle"
"LspSagaBorderTitle"
"LspSagaCodeActionContent"
"LspSagaFinderSelection"
"LspSagaDiagnosticHeader"]
{:fg colors.bright_aqua})
(utils.highlight "LspFloatWinNormal" {:bg colors.dark0_hard})
(utils.highlight "LspFloatWinBorder" {:bg colors.dark0_hard
:fg colors.dark0_hard})
(utils.highlight "TargetWord" {:fg colors.bright_aqua})

4
files/.config/nvim/fnl/plugins/symbols-outline.fnl Normal file
View file

@ -0,0 +1,4 @@
(module plugins.symbols-outline
{require {symbols-outline symbols-outline}})
(symbols-outline.setup {:highlight_hovered_item true :show_guides true})

26
files/.config/nvim/fnl/plugins/treesitter.fnl Normal file
View file

@ -0,0 +1,26 @@
(module plugins.treesitter
{autoload {a aniseed.core}
require {configs nvim-treesitter.configs}
require-macros [macros]})
(configs.setup
{:ensure_installed "all"
:highlight {:enable true
:disable ["fennel"]}
:incremental_selection {:enable true
:keymaps {:init_selection "gss"
:node_incremental "gsl"
:node_decremental "gsh"
:scope_incremental "gsj"
:scope_decremental "gsk"}}
; Might fuck with gitsigns
:rainbow {:enable true
:extended_mode true}
:context_commentstring {:enable true}})
;:indent {:enable true}
;:disable ["lua"]

25
files/.config/nvim/fnl/plugins/trouble.fnl Normal file
View file

@ -0,0 +1,25 @@
(module plugins.trouble
{autoload {utils utils
colors colors}
require {trouble trouble}})
(trouble.setup
{:icons false
:auto_preview true
:auto_close true
:auto_open false
:action_keys
{:jump "o"
:jump_close "<CR>"
:close "<esc>"
:cancel "q"
:hover ["a" "K"]}})
(utils.highlight "LspTroubleFoldIcon" {:bg "NONE" :fg colors.bright_orange})
(utils.highlight "LspTroubleCount" {:bg "NONE" :fg colors.bright_green})
(utils.highlight "LspTroubleText" {:bg "NONE" :fg colors.light0})
(utils.highlight "LspTroubleSignError" {:bg "NONE" :fg colors.bright_red})
(utils.highlight "LspTroubleSignWarning" {:bg "NONE" :fg colors.bright_yellow})
(utils.highlight "LspTroubleSignInformation" {:bg "NONE" :fg colors.bright_aqua})
(utils.highlight "LspTroubleSignHint" {:bg "NONE" :fg colors.bright_blue})

23
files/.config/nvim/init.vim
View file

@ -241,29 +241,6 @@ let g:user_emmet_settings = { 'javascript.jsx' : { 'extends' : 'jsx' }, 'typescr
let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
let g:qs_lazy_highlight = 1
" au VimEnter * RainbowParenthesesToggle
" au Syntax * RainbowParenthesesLoadRound
" au Syntax * RainbowParenthesesLoadSquare
" au Syntax * RainbowParenthesesLoadBraces
"map <Leader>f <Plug>(easymotion-bd-f)
"map <Leader>s <Plug>(easymotion-overwin-f2)
"let g:EasyMotion_smartcase = 1
let g:signify_sign_add = '▍'
let g:signify_sign_delete = '▍'
let g:signify_sign_delete_first_line = '▍'
let g:signify_sign_change = '▍'
"let g:signify_sign_show_text = 0
hi SignifySignDelete cterm=NONE gui=NONE guifg='#fb4934'
hi SignifySignChange cterm=NONE gui=NONE guifg='#83a598'
hi SignifySignAdd cterm=NONE gui=NONE guifg='#8ec07c'
" }}}
" }}}