[NeoVim] Clean plugins settings

.config/nvim/fnl/feline/feline-solarized.fnl

@@ -1,15 +0,0 @@
-(local colors (require :solarized.colors))
-
-{:fg colors.fg
- :bg colors.bg_alt
- :black colors.black
- :skyblue colors.paleblue
- :cyan colors.cyan
- :green colors.green
- :oceanblue colors.blue
- :magenta colors.magenta
- :orange colors.orange
- :red colors.red
- :violet colors.purple
- :white colors.white
- :yellow colors.yellow}

.config/nvim/fnl/plugins.fnl

@@ -1,74 +1,90 @@
 (import-macros {: packer : packer-setup : use!} :hibiscus.packer)
+(import-macros {: setup} :macros)
 
 (packer-setup)
 
 (packer
-  (use! "~/.config/nvim/themes/solarized.nvim")
+  (use! :udayvir-singh/tangerine.nvim)
+  (use! :udayvir-singh/hibiscus.nvim)
 
-  (use! :nvim-lua/popup.nvim)
+  (use! "~/.config/nvim/themes/solarized.nvim"
+        :config (require :settings.solarized))
+
+  (use! :nvim-lua/popup.nvim
+        :config (require :popup))
 
   (use! :nvim-treesitter/nvim-treesitter
-        :run ":TSUpdate")
+        :run ":TSUpdate"
+        :config (require :settings.treesitter))
 
   (use! :feline-nvim/feline.nvim
-        :requires :kyazdani42/nvim-web-devicons)
+        :requires [:kyazdani42/nvim-web-devicons
+                   "~/.config/nvim/themes/solarized.nvim"]
+        :config (require :settings.feline))
 
-  (use! :williamboman/mason.nvim
+  (use! :s1n7ax/nvim-window-picker
-        :requires [
+        :config (require :settings.window-picker))
-          :williamboman/mason-lspconfig.nvim
-          :neovim/nvim-lspconfig
-        ])
 
   (use! :nvim-neo-tree/neo-tree.nvim
         :branch "v2.x"
-        :requires [
+        :requires [:nvim-lua/plenary.nvim
-          :nvim-lua/plenary.nvim
+                   :nvim-telescope/telescope.nvim
                    :kyazdani42/nvim-web-devicons
                    :MunifTanjim/nui.nvim
-          :s1n7ax/nvim-window-picker
+                   :s1n7ax/nvim-window-picker]
-        ])
+        :config (require :settings.neo-tree))
 
-  (use! :mrjones2014/smart-splits.nvim)
+  (use! :mrjones2014/smart-splits.nvim
+        :config (require :settings.smart-splits))
 
-  (use! :famiu/bufdelete.nvim)
+  (use! :famiu/bufdelete.nvim
+        :config (require :bufdelete))
 
   (use! :akinsho/bufferline.nvim
         :tag "v2.*"
-        :requires :kyazdani42/nvim-web-devicons)
+        :requires [:kyazdani42/nvim-web-devicons
+                   :famiu/bufdelete.nvim
+                   "~/.config/nvim/themes/solarized.nvim"]
+        :config (require :settings.bufferline))
 
-  (use! :windwp/nvim-autopairs)
+  (use! :windwp/nvim-autopairs
+        :config (setup :nvim-autopairs))
 
-  (use! :lewis6991/gitsigns.nvim)
+  (use! :lewis6991/gitsigns.nvim
+        :config (setup :gitsigns))
 
-  (use! :declancm/cinnamon.nvim)
+  (use! :declancm/cinnamon.nvim
+        :config (setup :cinnamon))
 
-  (use! :stevearc/aerial.nvim)
+  (use! :stevearc/aerial.nvim
+        :config (require :settings.aerial))
 
-  (use! :nmac427/guess-indent.nvim)
+  (use! :nmac427/guess-indent.nvim
+        :config (setup :guess-indent))
 
   (use! :nvim-telescope/telescope.nvim
-        :requires :nvim-lua/plenary.nvim)
+        :requires [:nvim-lua/plenary.nvim
+                   :s1n7ax/nvim-window-picker]
+        :config (require :settings.telescope))
 
   (use! :sindrets/diffview.nvim
-        :requires :nvim-lua/plenary.nvim)
+        :requires [:nvim-lua/plenary.nvim]
+        :config (require :settings.diffview))
 
-  (use! :hrsh7th/nvim-cmp
+  (use! :neovim/nvim-lspconfig
-        :requires [
+        :requires [:williamboman/mason-lspconfig.nvim
+                   :williamboman/mason.nvim
                    :hrsh7th/cmp-omni
                    :hrsh7th/cmp-nvim-lsp
                    :onsails/lspkind.nvim
-        ])
+                   :hrsh7th/nvim-cmp
-
-  (use! :jose-elias-alvarez/null-ls.nvim)
-
-  (use! :L3MON4D3/LuaSnip
-        :requires [
                    :saadparwaiz1/cmp_luasnip
                    :rafamadriz/friendly-snippets
-        ])
+                   :L3MON4D3/LuaSnip]
+        :config (require :settings.lspconfig))
 
-  (use! :lervag/vimtex)
+  (use! :jose-elias-alvarez/null-ls.nvim
+        :config (require :settings.null-ls))
 
-  (use! :udayvir-singh/tangerine.nvim)
+  (use! :lervag/vimtex
-  (use! :udayvir-singh/hibiscus.nvim)
+        :config (require :settings.vimtex)))
-)

.config/nvim/fnl/settings.fnl

@@ -1,176 +0,0 @@
-(import-macros {: g! : exec : map! : set! : augroup!} :hibiscus.vim)
-(import-macros {: setup} :macros)
-
-; Theme
-(g! :solarized_italic_comments    true)
-(g! :solarized_italic_keywords    true)
-(g! :solarized_italic_functions   true)
-(g! :solarized_italic_variables   false)
-(g! :solarized_contrast           true)
-(g! :solarized_borders            false)
-(g! :solarized_disable_background false)
-((. (require :solarized) :set))
-
-(require :popup)
-
-; TreeSitter
-(setup :nvim-treesitter.configs {
-       :ensure_installed [:c :lua :rust :java :python :javascript :typescript :fennel]
-       :sync_install false
-       :ignore_install []
-       :highlight {:enable true
-                   :disable []
-                   :additional_vim_regex_highlighting false}})
-
-; Feline
-(setup :feline {
-       :theme (require :feline.feline-solarized)
-       :force_inactive {:filetypes ["^neo\\-tree$"
-                                    "^aerial$"
-                                    "^packer$"
-                                    "^startify$"
-                                    "^fugitive$"
-                                    "^fugitiveblame$"
-                                    "^qf$"
-                                    "^help$"
-                                    "^DiffviewFileHistory"]
-                        :buftypes  ["^terminal$"]
-                        :bufnames  ["neo\\-.*"]}})
-
-; Window picker
-(setup :window-picker {
-       :autoselect_one true
-       :selection_chars "ABCDEFGHIJKLMNOP"
-       :filter_rules {:bo {:filetype [:NvimTree :neo-tree :notify :aerial]
-                           :buftype  [:terminal]}}})
-
-; NeoTree
-(g! :neo_tree_remove_legacy_commands 1)
-(setup :neo-tree {
-       :close_if_last_window true
-       :window {:width 30
-                :mappings {:<cr> "open_with_window_picker"
-                           :S    "split_with_window_picker"
-                           :s    "vsplit_with_window_picker"}}
-       :filesystem {:filtered_items {:visible true}
-                    :follow_current_file true
-                    :window {:mappings {:/         "noop"
-                                        :g/        "fuzzy_finder"
-                                        :f         "noop"
-                                        :ff        (fn [] (exec [[:Telescope "find_files"]]))
-                                        :fg        (fn [] (exec [[:Telescope "live_grep"]]))
-                                        :<S-Right> (fn [])
-                                        :<S-Left>  (fn [])}}}
-       :renderers {:directory [[:indent]
-                               [:icon]
-                               [:current_filter]
-                               [:name]
-                               [:clipboard]
-                               {1 "diagnostics" :errors_only true}]
-                   :file [[:indent]
-                          [:icon]
-                          {1 "name" :use_git_status_colors true :zindex 10}
-                          [:clipboard]
-                          [:bufnr]
-                          [:modified]
-                          [:diagnostics]
-                          [:git_status]]}})
-(map! [n] :f ":Neotree focus<CR>")
-(map! [n] :F (fn [] (exec [[:Neotree "toggle"] [:Neotree "toggle" "action=show"]])))
-(augroup! :qf [[FileType] [qf] "set nobuflisted|call feedkeys(\"F\")"])
-
-; Smart splits
-(local smart-splits (require :smart-splits))
-(map! [n] :<C-Left>    smart-splits.move_cursor_left)
-(map! [n] :<C-Down>    smart-splits.move_cursor_down)
-(map! [n] :<C-Up>      smart-splits.move_cursor_up)
-(map! [n] :<C-Right>   smart-splits.move_cursor_right)
-(map! [n] :<C-S-Up>    smart-splits.resize_up)
-(map! [n] :<C-S-Down>  smart-splits.resize_down)
-(map! [n] :<C-S-Left>  smart-splits.resize_left)
-(map! [n] :<C-S-Right> smart-splits.resize_right)
-
-(require :bufdelete)
-
-; Bufferline
-(local colors (require :solarized.colors))
-(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}]
-                 :enforce_regular_tabs true
-                 :separator_style "slant"}
-       :highlights {:separator          {:fg colors.bg_alt}
-                    :separator_visible  {:fg colors.bg_alt}
-                    :separator_selected {:fg colors.bg_alt}}})
-(map! [n] :<S-Right> ":bnext<CR>")
-(map! [n] :<S-Left>  ":bprevious<CR>")
-(map! [n] :q         ":Bdelete<CR>")
-
-(setup :nvim-autopairs {})
-
-(setup :gitsigns {})
-
-(setup :cinnamon {})
-
-; Aerial
-(setup :aerial {
-       :close_behavior "global"
-       :open_automatic true
-       :placement_editor_edge true
-       :width 30
-       :on_attach (fn [bufnr]
-                      (map! [n :buffer] :t (fn []
-                                               (vim.tbl_map (fn [buf]
-                                                                (if (= (vim.api.nvim_buf_get_option buf "filetype") "aerial")
-                                                                    (vim.tbl_map (fn [win]
-                                                                                     (vim.api.nvim_set_current_win win))
-                                                                                 (vim.fn.win_findbuf buf))))
-                                                            (vim.api.nvim_list_bufs)))))})
-
-(setup :guess-indent)
-
-; Telescope
-(local actions (require :telescope.actions))
-(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"]}}})
-
-; DiffView
-(setup :diffview {
-       :keymaps {:view               {:q ":tabc<CR>"}
-                 :file_panel         {:q ":tabc<CR>"}
-                 :file_history_panel {:q ":tabc<CR>"}}})
-(map! [n] :r ":DiffviewOpen<CR>")
-(map! [n] :R ":DiffviewFileHistory %<CR>")
-
-; Null-LS
-(setup :null-ls {
-       :sources [(. (. (. (require :null-ls) :builtins) :diagnostics) :flake8)]})
-
-; VimTex
-(g! :vimtex_view_method "zathura")
-
-; General settings
-(g! :maplocalleader ",")
-(set! :clipboard    "unnamedplus")
-(set! :expandtab    true)
-(set! :fileencoding "utf-8")
-(set! :ignorecase   true)
-(set! :mouse        "a")
-(set! :showmode     false)
-(set! :number       true)
-(set! :shiftwidth   2)
-(set! :signcolumn   "yes")
-(set! :smartcase    true)
-(set! :spelllang    "en")
-(set! :tabstop      2)
-
-; 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)))

.config/nvim/fnl/settings/aerial.fnl

@@ -0,0 +1,16 @@
+(import-macros {: map!} :hibiscus.vim)
+(import-macros {: setup} :macros)
+
+(setup :aerial {
+       :close_behavior "global"
+       :open_automatic true
+       :placement_editor_edge true
+       :width 30
+       :on_attach (fn [bufnr]
+                      (map! [n :buffer] :t (fn []
+                                               (vim.tbl_map (fn [buf]
+                                                                (if (= (vim.api.nvim_buf_get_option buf "filetype") "aerial")
+                                                                    (vim.tbl_map (fn [win]
+                                                                                     (vim.api.nvim_set_current_win win))
+                                                                                 (vim.fn.win_findbuf buf))))
+                                                            (vim.api.nvim_list_bufs)))))})

.config/nvim/fnl/settings/bufferline.fnl

@@ -0,0 +1,17 @@
+(import-macros {: map!} :hibiscus.vim)
+(import-macros {: setup} :macros)
+
+(local colors (require :solarized.colors))
+(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}]
+                 :enforce_regular_tabs true
+                 :separator_style "slant"}
+       :highlights {:separator          {:fg colors.bg_alt}
+                    :separator_visible  {:fg colors.bg_alt}
+                    :separator_selected {:fg colors.bg_alt}}})
+(map! [n] :<S-Right> ":bnext<CR>")
+(map! [n] :<S-Left>  ":bprevious<CR>")
+(map! [n] :q         ":Bdelete<CR>")

.config/nvim/fnl/settings/diffview.fnl

@@ -0,0 +1,9 @@
+(import-macros {: map!} :hibiscus.vim)
+(import-macros {: setup} :macros)
+
+(setup :diffview {
+       :keymaps {:view               {:q ":tabc<CR>"}
+                 :file_panel         {:q ":tabc<CR>"}
+                 :file_history_panel {:q ":tabc<CR>"}}})
+(map! [n] :r ":DiffviewOpen<CR>")
+(map! [n] :R ":DiffviewFileHistory %<CR>")

.config/nvim/fnl/settings/feline.fnl

@@ -0,0 +1,31 @@
+(import-macros {: setup} :macros)
+
+(local colors (require :solarized.colors))
+
+(local theme {:fg        colors.fg
+              :bg        colors.bg_alt
+              :black     colors.black
+              :skyblue   colors.paleblue
+              :cyan      colors.cyan
+              :green     colors.green
+              :oceanblue colors.blue
+              :magenta   colors.magenta
+              :orange    colors.orange
+              :red       colors.red
+              :violet    colors.purple
+              :white     colors.white
+              :yellow    colors.yellow})
+
+(setup :feline {
+       :theme theme
+       :force_inactive {:filetypes ["^neo\\-tree$"
+                                    "^aerial$"
+                                    "^packer$"
+                                    "^startify$"
+                                    "^fugitive$"
+                                    "^fugitiveblame$"
+                                    "^qf$"
+                                    "^help$"
+                                    "^DiffviewFileHistory"]
+                        :buftypes  ["^terminal$"]
+                        :bufnames  ["neo\\-.*"]}})

.config/nvim/fnl/settings/general.fnl

@@ -0,0 +1,20 @@
+(import-macros {: g! : set!} :hibiscus.vim)
+
+(g! :maplocalleader ",")
+(set! :clipboard    "unnamedplus")
+(set! :expandtab    true)
+(set! :fileencoding "utf-8")
+(set! :ignorecase   true)
+(set! :mouse        "a")
+(set! :showmode     false)
+(set! :number       true)
+(set! :shiftwidth   2)
+(set! :signcolumn   "yes")
+(set! :smartcase    true)
+(set! :spelllang    "en")
+(set! :tabstop      2)
+
+; 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)))

.config/nvim/fnl/settings/lspconfig.fnl

@@ -33,7 +33,7 @@
       (do (local lsp_opts {:on_attach on_attach
                            :capabilities capabilities
                            :flags {:debounce_text_changes 150}})
-          (local (status config) (pcall require (.. "lspconfig." lsp)))
+          (local (status config) (pcall require (.. "settings.lsp." lsp)))
           (if status
               (config.setup lsp_opts)
               ((. (. (require :lspconfig) lsp) :setup) lsp_opts))))

.config/nvim/fnl/settings/neo-tree.fnl

@@ -0,0 +1,36 @@
+(import-macros {: g! : exec : map! : augroup!} :hibiscus.vim)
+(import-macros {: setup} :macros)
+
+(g! :neo_tree_remove_legacy_commands 1)
+(setup :neo-tree {
+       :close_if_last_window true
+       :window {:width 30
+                :mappings {:<cr> "open_with_window_picker"
+                           :S    "split_with_window_picker"
+                           :s    "vsplit_with_window_picker"}}
+       :filesystem {:filtered_items {:visible true}
+                    :follow_current_file true
+                    :window {:mappings {:/         "noop"
+                                        :g/        "fuzzy_finder"
+                                        :f         "noop"
+                                        :ff        (fn [] (exec [[:Telescope "find_files"]]))
+                                        :fg        (fn [] (exec [[:Telescope "live_grep"]]))
+                                        :<S-Right> (fn [])
+                                        :<S-Left>  (fn [])}}}
+       :renderers {:directory [[:indent]
+                               [:icon]
+                               [:current_filter]
+                               [:name]
+                               [:clipboard]
+                               {1 "diagnostics" :errors_only true}]
+                   :file [[:indent]
+                          [:icon]
+                          {1 "name" :use_git_status_colors true :zindex 10}
+                          [:clipboard]
+                          [:bufnr]
+                          [:modified]
+                          [:diagnostics]
+                          [:git_status]]}})
+(map! [n] :f ":Neotree focus<CR>")
+(map! [n] :F (fn [] (exec [[:Neotree "toggle"] [:Neotree "toggle" "action=show"]])))
+(augroup! :neo-tree [[FileType] [qf] "set nobuflisted|call feedkeys(\"F\")"])

.config/nvim/fnl/settings/null-ls.fnl

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

.config/nvim/fnl/settings/smart-splits.fnl

@@ -0,0 +1,11 @@
+(import-macros {: map!} :hibiscus.vim)
+
+(local smart-splits (require :smart-splits))
+(map! [n] :<C-Left>    smart-splits.move_cursor_left)
+(map! [n] :<C-Down>    smart-splits.move_cursor_down)
+(map! [n] :<C-Up>      smart-splits.move_cursor_up)
+(map! [n] :<C-Right>   smart-splits.move_cursor_right)
+(map! [n] :<C-S-Up>    smart-splits.resize_up)
+(map! [n] :<C-S-Down>  smart-splits.resize_down)
+(map! [n] :<C-S-Left>  smart-splits.resize_left)
+(map! [n] :<C-S-Right> smart-splits.resize_right)

.config/nvim/fnl/settings/solarized.fnl

@@ -0,0 +1,10 @@
+(import-macros {: g!} :hibiscus.vim)
+
+(g! :solarized_italic_comments    true)
+(g! :solarized_italic_keywords    true)
+(g! :solarized_italic_functions   true)
+(g! :solarized_italic_variables   false)
+(g! :solarized_contrast           true)
+(g! :solarized_borders            false)
+(g! :solarized_disable_background false)
+((. (require :solarized) :set))

.config/nvim/fnl/settings/telescope.fnl

@@ -0,0 +1,9 @@
+(import-macros {: setup} :macros)
+
+(local actions (require :telescope.actions))
+(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"]}}})

.config/nvim/fnl/settings/treesitter.fnl

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

.config/nvim/fnl/settings/vimtex.fnl

@@ -0,0 +1,3 @@
+(import-macros {: g!} :hibiscus.vim)
+
+(g! :vimtex_view_method "zathura")

.config/nvim/fnl/settings/window-picker.fnl

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

.config/nvim/init.fnl

@@ -1,5 +1,3 @@
 (require :plugins)
 
-(require :settings)
+(require :settings.general)
-
-(require :lspconfig.settings)

.config/nvim/spell/en.utf-8.add

@@ -17,3 +17,5 @@ projectional
 QL
 DSLs
 Coulon
+JADEL
+microservicization