diff --git a/files/.config/nvim/fnl/init.fnl b/files/.config/nvim/fnl/init.fnl index 9859b9f..d01a8fb 100644 --- a/files/.config/nvim/fnl/init.fnl +++ b/files/.config/nvim/fnl/init.fnl @@ -18,7 +18,18 @@ (set vim.g.conjure#client#fennel#aniseed#aniseed_module_prefix "aniseed.") -(set vim.g.sexp_filetypes "clojure,scheme,lisp,timl,fennel") + + + +; Colors ------------------------------------------------------- foldstart + +(utils.highlight-add + [ "GruvboxBlueSign" "GruvboxAquaSign" "GruvboxRedSign" "GruvboxYellowSign" "GruvboxGreenSign" "GruvboxOrangeSign" "GruvboxPurpleSign"] + {:bg "NONE"}) + + + +; foldend ; Treesitter ------------------------------------------------------- foldstart diff --git a/files/.config/nvim/fnl/utils.fnl b/files/.config/nvim/fnl/utils.fnl index eb23e5d..6631c45 100644 --- a/files/.config/nvim/fnl/utils.fnl +++ b/files/.config/nvim/fnl/utils.fnl @@ -78,14 +78,28 @@ :faded_orange "#af3a03" :gray "#928374"}) +(defn surround-if-present [a mid b] + (if mid + (.. a mid b) + "")) -(defn highlight [group-arg colset] +(defn highlight [group-arg colset] (let [default { :fg "NONE" :bg "NONE" :gui "NONE"} opts (a.merge default colset) hl-groups (if (a.string? group-arg) [group-arg] group-arg)] (each [_ group (ipairs hl-groups)] (nvim.command (.. "hi! "group" guifg='"opts.fg"' guibg='"opts.bg"' gui='"opts.gui"'"))))) +(defn highlight-add [group-arg colset] + (let [hl-groups (if (a.string? group-arg) [group-arg] group-arg)] + (each [_ group (ipairs hl-groups)] + (nvim.command + (.. "hi! " + group + (surround-if-present " guibg='"colset.bg"'") + (surround-if-present " guifg='"colset.fg"'") + (surround-if-present " gui='"colset.gui"'")))))) + (defn comp [f g] (fn [...] diff --git a/files/.config/nvim/plugins.lua b/files/.config/nvim/plugins.lua index 5f6365a..8c84055 100644 --- a/files/.config/nvim/plugins.lua +++ b/files/.config/nvim/plugins.lua @@ -17,9 +17,6 @@ require("packer").startup(function(use) use "tami5/compe-conjure" - use "guns/vim-sexp" - use "tpope/vim-sexp-mappings-for-regular-people" - use "pwntester/octo.nvim" use "Olical/conjure" @@ -101,7 +98,7 @@ require("packer").startup(function(use) use "honza/vim-snippets" use "tommcdo/vim-exchange" use "kien/rainbow_parentheses.vim" - --use "bhurlow/vim-parinfer" + use "bhurlow/vim-parinfer" use "ray-x/lsp_signature.nvim"