From b411775c778311ea45c5a51f9788c233f6cd408f Mon Sep 17 00:00:00 2001 From: RhiobeT Date: Wed, 24 Aug 2022 16:05:58 +0200 Subject: [PATCH] [NeoVim] Clean plugins settings --- .config/nvim/fnl/feline/feline-solarized.fnl | 15 -- .config/nvim/fnl/plugins.fnl | 102 +++++----- .config/nvim/fnl/settings.fnl | 176 ------------------ .config/nvim/fnl/settings/aerial.fnl | 16 ++ .config/nvim/fnl/settings/bufferline.fnl | 17 ++ .config/nvim/fnl/settings/diffview.fnl | 9 + .config/nvim/fnl/settings/feline.fnl | 31 +++ .config/nvim/fnl/settings/general.fnl | 20 ++ .../fnl/{lspconfig => settings/lsp}/ltex.fnl | 0 .../settings.fnl => settings/lspconfig.fnl} | 2 +- .config/nvim/fnl/settings/neo-tree.fnl | 36 ++++ .config/nvim/fnl/settings/null-ls.fnl | 5 + .config/nvim/fnl/settings/smart-splits.fnl | 11 ++ .config/nvim/fnl/settings/solarized.fnl | 10 + .config/nvim/fnl/settings/telescope.fnl | 9 + .config/nvim/fnl/settings/treesitter.fnl | 9 + .config/nvim/fnl/settings/vimtex.fnl | 3 + .config/nvim/fnl/settings/window-picker.fnl | 7 + .config/nvim/init.fnl | 4 +- .config/nvim/spell/en.utf-8.add | 2 + 20 files changed, 246 insertions(+), 238 deletions(-) delete mode 100644 .config/nvim/fnl/feline/feline-solarized.fnl delete mode 100644 .config/nvim/fnl/settings.fnl create mode 100644 .config/nvim/fnl/settings/aerial.fnl create mode 100644 .config/nvim/fnl/settings/bufferline.fnl create mode 100644 .config/nvim/fnl/settings/diffview.fnl create mode 100644 .config/nvim/fnl/settings/feline.fnl create mode 100644 .config/nvim/fnl/settings/general.fnl rename .config/nvim/fnl/{lspconfig => settings/lsp}/ltex.fnl (100%) rename .config/nvim/fnl/{lspconfig/settings.fnl => settings/lspconfig.fnl} (98%) create mode 100644 .config/nvim/fnl/settings/neo-tree.fnl create mode 100644 .config/nvim/fnl/settings/null-ls.fnl create mode 100644 .config/nvim/fnl/settings/smart-splits.fnl create mode 100644 .config/nvim/fnl/settings/solarized.fnl create mode 100644 .config/nvim/fnl/settings/telescope.fnl create mode 100644 .config/nvim/fnl/settings/treesitter.fnl create mode 100644 .config/nvim/fnl/settings/vimtex.fnl create mode 100644 .config/nvim/fnl/settings/window-picker.fnl diff --git a/.config/nvim/fnl/feline/feline-solarized.fnl b/.config/nvim/fnl/feline/feline-solarized.fnl deleted file mode 100644 index 77134e9..0000000 --- a/.config/nvim/fnl/feline/feline-solarized.fnl +++ /dev/null @@ -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} diff --git a/.config/nvim/fnl/plugins.fnl b/.config/nvim/fnl/plugins.fnl index 494a232..728578b 100644 --- a/.config/nvim/fnl/plugins.fnl +++ b/.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 - :requires [ - :williamboman/mason-lspconfig.nvim - :neovim/nvim-lspconfig - ]) + (use! :s1n7ax/nvim-window-picker + :config (require :settings.window-picker)) (use! :nvim-neo-tree/neo-tree.nvim :branch "v2.x" - :requires [ - :nvim-lua/plenary.nvim - :kyazdani42/nvim-web-devicons - :MunifTanjim/nui.nvim - :s1n7ax/nvim-window-picker - ]) + :requires [:nvim-lua/plenary.nvim + :nvim-telescope/telescope.nvim + :kyazdani42/nvim-web-devicons + :MunifTanjim/nui.nvim + :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 - :requires [ - :hrsh7th/cmp-omni - :hrsh7th/cmp-nvim-lsp - :onsails/lspkind.nvim - ]) + (use! :neovim/nvim-lspconfig + :requires [:williamboman/mason-lspconfig.nvim + :williamboman/mason.nvim + :hrsh7th/cmp-omni + :hrsh7th/cmp-nvim-lsp + :onsails/lspkind.nvim + :hrsh7th/nvim-cmp + :saadparwaiz1/cmp_luasnip + :rafamadriz/friendly-snippets + :L3MON4D3/LuaSnip] + :config (require :settings.lspconfig)) - (use! :jose-elias-alvarez/null-ls.nvim) + (use! :jose-elias-alvarez/null-ls.nvim + :config (require :settings.null-ls)) - (use! :L3MON4D3/LuaSnip - :requires [ - :saadparwaiz1/cmp_luasnip - :rafamadriz/friendly-snippets - ]) - - (use! :lervag/vimtex) - - (use! :udayvir-singh/tangerine.nvim) - (use! :udayvir-singh/hibiscus.nvim) -) + (use! :lervag/vimtex + :config (require :settings.vimtex))) diff --git a/.config/nvim/fnl/settings.fnl b/.config/nvim/fnl/settings.fnl deleted file mode 100644 index 172edc5..0000000 --- a/.config/nvim/fnl/settings.fnl +++ /dev/null @@ -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 {: "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"]])) - : (fn []) - : (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") -(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] : smart-splits.move_cursor_left) -(map! [n] : smart-splits.move_cursor_down) -(map! [n] : smart-splits.move_cursor_up) -(map! [n] : smart-splits.move_cursor_right) -(map! [n] : smart-splits.resize_up) -(map! [n] : smart-splits.resize_down) -(map! [n] : smart-splits.resize_left) -(map! [n] : 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] : ":bnext") -(map! [n] : ":bprevious") -(map! [n] :q ":Bdelete") - -(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"} - :file_panel {:q ":tabc"} - :file_history_panel {:q ":tabc"}}}) -(map! [n] :r ":DiffviewOpen") -(map! [n] :R ":DiffviewFileHistory %") - -; 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))) diff --git a/.config/nvim/fnl/settings/aerial.fnl b/.config/nvim/fnl/settings/aerial.fnl new file mode 100644 index 0000000..df078ff --- /dev/null +++ b/.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)))))}) diff --git a/.config/nvim/fnl/settings/bufferline.fnl b/.config/nvim/fnl/settings/bufferline.fnl new file mode 100644 index 0000000..b69da14 --- /dev/null +++ b/.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] : ":bnext") +(map! [n] : ":bprevious") +(map! [n] :q ":Bdelete") diff --git a/.config/nvim/fnl/settings/diffview.fnl b/.config/nvim/fnl/settings/diffview.fnl new file mode 100644 index 0000000..f0e5a62 --- /dev/null +++ b/.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"} + :file_panel {:q ":tabc"} + :file_history_panel {:q ":tabc"}}}) +(map! [n] :r ":DiffviewOpen") +(map! [n] :R ":DiffviewFileHistory %") diff --git a/.config/nvim/fnl/settings/feline.fnl b/.config/nvim/fnl/settings/feline.fnl new file mode 100644 index 0000000..24d3f98 --- /dev/null +++ b/.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\\-.*"]}}) diff --git a/.config/nvim/fnl/settings/general.fnl b/.config/nvim/fnl/settings/general.fnl new file mode 100644 index 0000000..6aa4941 --- /dev/null +++ b/.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))) diff --git a/.config/nvim/fnl/lspconfig/ltex.fnl b/.config/nvim/fnl/settings/lsp/ltex.fnl similarity index 100% rename from .config/nvim/fnl/lspconfig/ltex.fnl rename to .config/nvim/fnl/settings/lsp/ltex.fnl diff --git a/.config/nvim/fnl/lspconfig/settings.fnl b/.config/nvim/fnl/settings/lspconfig.fnl similarity index 98% rename from .config/nvim/fnl/lspconfig/settings.fnl rename to .config/nvim/fnl/settings/lspconfig.fnl index b007c4c..d333c17 100644 --- a/.config/nvim/fnl/lspconfig/settings.fnl +++ b/.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)))) diff --git a/.config/nvim/fnl/settings/neo-tree.fnl b/.config/nvim/fnl/settings/neo-tree.fnl new file mode 100644 index 0000000..1aad087 --- /dev/null +++ b/.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 {: "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"]])) + : (fn []) + : (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") +(map! [n] :F (fn [] (exec [[:Neotree "toggle"] [:Neotree "toggle" "action=show"]]))) +(augroup! :neo-tree [[FileType] [qf] "set nobuflisted|call feedkeys(\"F\")"]) diff --git a/.config/nvim/fnl/settings/null-ls.fnl b/.config/nvim/fnl/settings/null-ls.fnl new file mode 100644 index 0000000..99f7ff1 --- /dev/null +++ b/.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)]}) + diff --git a/.config/nvim/fnl/settings/smart-splits.fnl b/.config/nvim/fnl/settings/smart-splits.fnl new file mode 100644 index 0000000..a0106bb --- /dev/null +++ b/.config/nvim/fnl/settings/smart-splits.fnl @@ -0,0 +1,11 @@ +(import-macros {: map!} :hibiscus.vim) + +(local smart-splits (require :smart-splits)) +(map! [n] : smart-splits.move_cursor_left) +(map! [n] : smart-splits.move_cursor_down) +(map! [n] : smart-splits.move_cursor_up) +(map! [n] : smart-splits.move_cursor_right) +(map! [n] : smart-splits.resize_up) +(map! [n] : smart-splits.resize_down) +(map! [n] : smart-splits.resize_left) +(map! [n] : smart-splits.resize_right) diff --git a/.config/nvim/fnl/settings/solarized.fnl b/.config/nvim/fnl/settings/solarized.fnl new file mode 100644 index 0000000..c62e278 --- /dev/null +++ b/.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)) diff --git a/.config/nvim/fnl/settings/telescope.fnl b/.config/nvim/fnl/settings/telescope.fnl new file mode 100644 index 0000000..e77d67b --- /dev/null +++ b/.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"]}}}) diff --git a/.config/nvim/fnl/settings/treesitter.fnl b/.config/nvim/fnl/settings/treesitter.fnl new file mode 100644 index 0000000..4682a56 --- /dev/null +++ b/.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}}) diff --git a/.config/nvim/fnl/settings/vimtex.fnl b/.config/nvim/fnl/settings/vimtex.fnl new file mode 100644 index 0000000..c219395 --- /dev/null +++ b/.config/nvim/fnl/settings/vimtex.fnl @@ -0,0 +1,3 @@ +(import-macros {: g!} :hibiscus.vim) + +(g! :vimtex_view_method "zathura") diff --git a/.config/nvim/fnl/settings/window-picker.fnl b/.config/nvim/fnl/settings/window-picker.fnl new file mode 100644 index 0000000..9132c89 --- /dev/null +++ b/.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]}}}) diff --git a/.config/nvim/init.fnl b/.config/nvim/init.fnl index 6967b83..752de6f 100644 --- a/.config/nvim/init.fnl +++ b/.config/nvim/init.fnl @@ -1,5 +1,3 @@ (require :plugins) -(require :settings) - -(require :lspconfig.settings) +(require :settings.general) diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add index fd50f5a..72db7ab 100644 --- a/.config/nvim/spell/en.utf-8.add +++ b/.config/nvim/spell/en.utf-8.add @@ -17,3 +17,5 @@ projectional QL DSLs Coulon +JADEL +microservicization