rhiobet/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

[NeoVim] Slight syntax improvements

Browse Source
This commit is contained in:
RhiobeT Chan
2022-08-25 21:36:31 +02:00
committed by Pierre Jeanjean
parent ec27ae8a22
commit 5b27c94972
11 changed files with 253 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.config/nvim/fnl/settings/aerial.fnl
View File

@@ -1,8 +1,8 @@
(import-macros {: map!} :hibiscus.vim)
(import-macros {: setup} :macros)
(setup :aerial {
:close_behavior "global"
(setup :aerial
{:close_behavior "global"
:open_automatic true
:placement_editor_edge true
:width 30

4
.config/nvim/fnl/settings/bufferline.fnl
View File

@@ -3,8 +3,8 @@
(local colors (require :solarized.colors))
(setup :bufferline {
:options {:close_command "Bdelete %d"
(setup :bufferline
{:options {:close_command "Bdelete %d"
:right_mouse_command "Bdelete %d"
:offsets [{:filetype "neo-tree" :text "File Explorer" :padding 1}
{:filetype "aerial" :text "Outline" :padding 1}]

4
.config/nvim/fnl/settings/diffview.fnl
View File

@@ -1,8 +1,8 @@
(import-macros {: map!} :hibiscus.vim)
(import-macros {: setup} :macros)
(setup :diffview {
:keymaps {:view {:q ":tabc<CR>"}
(setup :diffview
{:keymaps {:view {:q ":tabc<CR>"}
:file_panel {:q ":tabc<CR>"}
:file_history_panel {:q ":tabc<CR>"}}})

7
.config/nvim/fnl/settings/feline.fnl
View File

@@ -2,7 +2,8 @@
(local colors (require :solarized.colors))
(local theme {:fg colors.fg
(local theme
{:fg colors.fg
:bg colors.bg_alt
:black colors.black
:skyblue colors.paleblue
@@ -16,8 +17,8 @@
:white colors.white
:yellow colors.yellow})
(setup :feline {
:theme theme
(setup :feline
{:theme theme
:force_inactive {:filetypes ["^neo\\-tree$"
"^aerial$"
"^packer$"

82
.config/nvim/fnl/settings/lsp/ltex.fnl
View File

@@ -2,74 +2,86 @@
(local M {})
(local files {:dictionary (.. (vim.fn.stdpath "config") "/spell/en.utf-8.add")
(local files
{:dictionary (.. (vim.fn.stdpath "config") "/spell/en.utf-8.add")
:disabledRules (.. (vim.fn.stdpath "config") "/spell/disable.txt")
:hiddenFalsePositives (.. (vim.fn.stdpath "config") "/spell/false.txt")})
(fn file_exists [file] (let [f (io.open file "rb")]
(match f nil false
_ (do (f.close f) true))))
(fn file_exists [file]
(let [f (io.open file "rb")]
(if f
(do (f:close) true)
false)))
(fn lines_from [file] (match (file_exists file) false []
true (let [lines []]
(do (each [line (io.lines file)]
(table.insert lines line))
lines))))
(fn lines_from [file]
(if (file_exists file)
(icollect [line (io.lines file)] line)
[]))
(fn get_client_by_name [name] (let [buf_clients (vim.lsp.buf_get_clients)]
(each [_ client (ipairs buf_clients)]
(match client.name name (lua "return client")))))
(fn get_client_by_name [name]
(let [buf_clients (vim.lsp.buf_get_clients)]
(var found_client nil)
(each [_ client (ipairs buf_clients) :until found_client]
(match client.name name (set found_client client)))
found_client))
(fn update_config [lang configtype] (let [client (get_client_by_name "ltex")]
(if client
(if (. client.config.settings.ltex configtype)
(fn update_config [lang configtype]
(let [client (get_client_by_name "ltex")]
(if (and client (. client.config.settings.ltex configtype))
(do (tset client.config.settings.ltex configtype {lang (lines_from (. files configtype))})
(client.notify "workspace/didChangeConfiguration" client.config.settings))
(vim.notify "Error when reading dictionary config, check it")))))
(vim.notify "Error when reading dictionary config, check it"))))
(fn add_to_file [configtype lang file value] (let [dict (lines_from file)]
(do (each [_ v (ipairs dict)]
(if (= v value) (lua "return nil")))
(fn add_to_file [configtype lang file value]
(let [dict (lines_from file)]
(var found_existing false)
(each [_ v (ipairs dict) :until found_existing]
(if (= v value) (set found_existing true)))
(if (not found_existing)
(let [file (io.open file "a+")]
(if file
(do (file.write file (.. value "\n"))
(file.close file)
(do (file:write (.. value "\n"))
(file:close)
(update_config lang configtype))
(vim.notify (string.format "Failed insert %s" value)))))))
(fn do_command [arg configtype] (each [lang words (pairs arg)]
(fn do_command [arg configtype]
(each [lang words (pairs arg)]
(each [_ word (ipairs words)]
(add_to_file configtype lang (. files configtype) word))))
(tset vim.lsp.commands "_ltex.addToDictionary"
(fn [command _] (do_command (. (. command.arguments 1) :words) "dictionary")))
(fn [command _] (do_command (. command.arguments 1 :words) :dictionary)))
(tset vim.lsp.commands "_ltex.disableRules"
(fn [command _] (do_command (. (. command.arguments 1) :ruleIds) "disabledRules")))
(fn [command _] (do_command (. command.arguments 1 :ruleIds) :disabledRules)))
(tset vim.lsp.commands "_ltex.hideFalsePositives"
(fn [command _] (do_command (. (. command.arguments 1) :falsePositives) "hiddenFalsePositives")))
(fn [command _] (do_command (. command.arguments 1 :falsePositives) :hiddenFalsePositives)))
(fn post_attach [] (do (exec [[:setlocal "spell"] [:setlocal "nospell"]])
(fn post_attach []
(exec [[:setlocal "spell"] [:setlocal "nospell"]])
(update_config "en-US" "dictionary")
(update_config "en-US" "disabledRules")
(update_config "en-US" "hiddenFalsePositives")
(map! [n :buffer :verbose] :zug (fn [] (do (exec [[:normal! "zug"]])
(map! [n :buffer :verbose] :zug (fn [] (exec [[:normal! "zug"]])
(update_config "en-US" "dictionary")
nil))
nil)
"Remove word from spellfile and update ltex")
(map! [n :buffer :verbose] :zg (fn [] (do (exec [[:normal! "zg"]])
(map! [n :buffer :verbose] :zg (fn [] (exec [[:normal! "zg"]])
(update_config "en-US" "dictionary")
nil))
nil)
"Add word to spellfile and update ltex")
nil))
nil)
(set M.setup (fn [opts]
((. (. (require "lspconfig") "ltex") :setup) {:on_attach (fn [client]
(do (opts.on_attach client) (post_attach) nil))
(fn M.setup [opts]
((. (require :lspconfig) :ltex :setup)
{:on_attach (fn [client] (opts.on_attach client)
(post_attach)
nil)
:capabilities opts.capabilities
:flags opts.flags
:settings {:ltex {:dictionary []
:disabledRules []
:hiddenFalsePositives []}
:additionalRules {:enablePickyRules true}}})))
:additionalRules {:enablePickyRules true}}}))
M

41
.config/nvim/fnl/settings/lspconfig.fnl
View File

@@ -1,7 +1,12 @@
(import-macros {: map!} :hibiscus.vim)
(import-macros {: setup} :macros)
(local servers [:pyright :sumneko_lua :eslint :tsserver :ltex])
(local servers
[:eslint
:ltex
:pyright
:sumneko_lua
:tsserver])
; Mappings.
(map! [n :noremap] "<space>e" vim.diagnostic.open_float)
@@ -10,7 +15,7 @@
(map! [n :noremap] "<space>q" vim.diagnostic.setloclist)
(fn on_attach [_ bufnr]
(do (map! [n :noremap :buffer] :gD vim.lsp.buf.declaration)
(map! [n :noremap :buffer] :gD vim.lsp.buf.declaration)
(map! [n :noremap :buffer] :gd vim.lsp.buf.definition)
(map! [n :noremap :buffer] :K vim.lsp.buf.hover)
(map! [n :noremap :buffer] :gi vim.lsp.buf.implementation)
@@ -22,21 +27,23 @@
(map! [n :noremap :buffer] :<space>rn vim.lsp.buf.rename)
(map! [n :noremap :buffer] :<space>ca vim.lsp.buf.code_action)
(map! [n :noremap :buffer] :gr vim.lsp.buf.references)
(map! [n :noremap :buffer] :<space>f vim.lsp.buf.formatting)))
(map! [n :noremap :buffer] :<space>f vim.lsp.buf.formatting))
(local capabilities ((. (require :cmp_nvim_lsp) :update_capabilities) (vim.lsp.protocol.make_client_capabilities)))
(setup :mason)
(setup :mason-lspconfig {:ensure_installed servers})
(setup :mason-lspconfig
{:ensure_installed servers})
(each [_ lsp (pairs servers)]
(do (local lsp_opts {:on_attach on_attach
(local lsp_opts
{:on_attach on_attach
:capabilities capabilities
:flags {:debounce_text_changes 150}})
(local (status config) (pcall require (.. "settings.lsp." lsp)))
(if status
(config.setup lsp_opts)
((. (. (require :lspconfig) lsp) :setup) lsp_opts))))
((. (require :lspconfig) lsp :setup) lsp_opts)))
; LuaSnip setup
(local luasnip (require :luasnip))
@@ -45,25 +52,27 @@
; nvim-cmp setup
(local lspkind (require :lspkind))
(local cmp (require :cmp))
(cmp.setup {:snippet {:expand (fn [args] (luasnip.lsp_expand args.body))}
:mapping (cmp.mapping.preset.insert {:<C-d> (cmp.mapping.scroll_docs -4)
(cmp.setup
{:snippet {:expand (fn [args] (luasnip.lsp_expand args.body))}
:mapping (cmp.mapping.preset.insert
{:<C-d> (cmp.mapping.scroll_docs -4)
:<C-f> (cmp.mapping.scroll_docs 4)
:<C-Space> (cmp.mapping.complete)
:<CR> (cmp.mapping.confirm {:behavior cmp.ConfirmBehavior.Replace
:select true})
:<Tab> (cmp.mapping (fn [fallback]
(if (cmp.visible)
:<Tab> (cmp.mapping
(fn [fallback] (if (cmp.visible)
(cmp.select_next_item)
(if (luasnip.expand_or_jumpable)
(luasnip.expand_or_jumpable)
(luasnip.expand_or_jump)
(fallback))))
(fallback)))
[:i :s])
:<S-Tab> (cmp.mapping (fn [fallback]
(if (cmp.visible)
:<S-Tab> (cmp.mapping
(fn [fallback] (if (cmp.visible)
(cmp.select_prev_item)
(if (luasnip.jumpable -1)
(luasnip.jumpable -1)
(luasnip.jump -1)
(fallback))))
(fallback)))
[:i :s])})
:sources [{:name "luasnip"}
{:name "nvim_lsp"}

18
.config/nvim/fnl/settings/neo-tree.fnl
View File

@@ -3,8 +3,8 @@
(g! :neo_tree_remove_legacy_commands 1)
(setup :neo-tree {
:close_if_last_window true
(setup :neo-tree
{:close_if_last_window true
:window {:width 30
:mappings {:<cr> "open_with_window_picker"
:S "split_with_window_picker"
@@ -20,20 +20,20 @@
:<S-Right> (fn [])
:<S-Left> (fn [])}}
:commands {:custom_open (fn [state]
(let [node (state.tree.get_node state.tree)
quoted_path (.. "'" (.. (node.get_id node) "'"))]
(do (exec [[:silent "!file -bL --mime" quoted_path "| grep -qv '^text\\|^inode' && xdg-open" quoted_path "&"]])
(let [node (state.tree:get_node)
quoted_path (.. "'" (.. (node:get_id) "'"))]
(exec [[:silent "!file -bL --mime" quoted_path "| grep -qv '^text\\|^inode' && xdg-open" quoted_path "&"]])
(if (= vim.v.shell_error 1)
((. (require :neo-tree.sources.filesystem.commands) :open) state)))))}}
((. (require :neo-tree.sources.filesystem.commands) :open) state))))}}
:renderers {:directory [[:indent]
[:icon]
[:current_filter]
[:name]
[:clipboard]
{1 "diagnostics" :errors_only true}]
{1 :diagnostics :errors_only true}]
:file [[:indent]
[:icon]
{1 "name" :use_git_status_colors true :zindex 10}
{1 :name :use_git_status_colors true :zindex 10}
[:clipboard]
[:bufnr]
[:modified]
@@ -48,4 +48,4 @@
; Startup
(if (or (= (vim.fn.expand "%") "") (not= (vim.fn.isdirectory (vim.fn.expand "%")) 0))
((. (require :neo-tree.command) :_command) (vim.fn.getcwd))
((. (require :neo-tree.command) :_command) "show" (vim.fn.getcwd)))
((. (require :neo-tree.command) :_command) :show (vim.fn.getcwd)))

4
.config/nvim/fnl/settings/null-ls.fnl
View File

@@ -1,4 +1,4 @@
(import-macros {: setup} :macros)
(setup :null-ls {
:sources [(. (. (. (require :null-ls) :builtins) :diagnostics) :flake8)]})
(setup :null-ls
{:sources [(. (require :null-ls) :builtins :diagnostics :flake8)]})

17
.config/nvim/fnl/settings/telescope.fnl
View File

@@ -2,9 +2,18 @@
(local actions (require :telescope.actions))
(setup :telescope {
:defaults {:mappings {:n {:S actions.file_split
(setup :telescope
{:defaults {:mappings {:n {:S actions.file_split
:s actions.file_vsplit}}
:get_selection_window (. (require :window-picker) :pick_window)}
:pickers {:find_files {:find_command [:fd "--type" "f" "--strip-cwd-prefix" "--hidden"]}
:live_grep {:vimgrep_arguments ["rg" "--color=never" "--no-heading" "--with-filename" "--line-number" "--column" "--smart-case" "--hidden"]}}})
:pickers {:find_files {:find_command [:fd "--type" "f"
"--strip-cwd-prefix"
"--hidden"]}
:live_grep {:vimgrep_arguments ["rg"
"--color=never"
"--no-heading"
"--with-filename"
"--line-number"
"--column"
"--smart-case"
"--hidden"]}}})

12
.config/nvim/fnl/settings/treesitter.fnl
View File

@@ -1,7 +1,15 @@
(import-macros {: setup} :macros)
(setup :nvim-treesitter.configs {
:ensure_installed [:c :lua :rust :java :python :javascript :typescript :fennel]
(setup :nvim-treesitter.configs
{:ensure_installed
[:c
:fennel
:java
:javascript
:lua
:python
:rust
:typescript]
:sync_install false
:ignore_install []
:highlight {:enable true

4
.config/nvim/fnl/settings/window-picker.fnl
View File

@@ -1,7 +1,7 @@
(import-macros {: setup} :macros)
(setup :window-picker {
:autoselect_one true
(setup :window-picker
{:autoselect_one true
:selection_chars "ABCDEFGHIJKLMNOP"
:filter_rules {:bo {:filetype [:NvimTree :neo-tree :notify :aerial]
:buftype [:terminal]}}})