From 7cd882157c0ebb92c1ec38863d6f664b146a31a2 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Thu, 21 Oct 2021 15:17:38 +0200 Subject: [PATCH] Clean up some plugins --- nvim/.config/nvim/fnl/dots/plugins.fnl | 204 +++++++----------- .../nvim/fnl/dots/plugins/detect-indent.fnl | 6 +- .../nvim/fnl/dots/plugins/gruvbox8.fnl | 15 ++ 3 files changed, 99 insertions(+), 126 deletions(-) create mode 100644 nvim/.config/nvim/fnl/dots/plugins/gruvbox8.fnl diff --git a/nvim/.config/nvim/fnl/dots/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins.fnl index 4e6a4f4..3f0507c 100644 --- a/nvim/.config/nvim/fnl/dots/plugins.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins.fnl @@ -23,112 +23,60 @@ :config {:compile_path (.. (vim.fn.stdpath "config") "/lua/packer_compiled.lua")}}))) (use - :jbyuki/instant.nvim {:config #(set vim.g.instant_username "ElKowar")} + ; sort me pls + + + + ; sorted from here! + :Olical/aniseed {:branch "develop"} :lewis6991/impatient.nvim {} - :rhysd/conflict-marker.vim {} :nvim-lua/plenary.nvim {} - :elkowar/antifennel-nvim {:opt false :config #(set vim.g.antifennel_executable "/home/leon/tmp/antifennel/antifennel")} - :elkowar/kmonad.vim {} - - :ruanyl/vim-gh-line {} - :rhysd/conflict-marker.vim {} - :wellle/visual-split.vim {} - :sindrets/diffview.nvim {} - :folke/persistence.nvim {:opt false :config #(require "dots.plugins.persistence")} - - :folke/zen-mode.nvim {:cmd ["ZenMode"] - :config #(require "dots.plugins.zen-mode")} - - :folke/twilight.nvim {:config #(require "dots.plugins.twilight")} - - :TimUntersberger/neogit {:config #(require "dots.plugins.neogit") - :cmd ["Neogit"]} - - - :lifepillar/vim-gruvbox8 {:opt false - :config - (fn [] - (set vim.g.gruvbox_italics 0) - (set vim.g.gruvbox_italicise_strings 0) - (set vim.g.gruvbox_filetype_hi_groups 1) - (set vim.g.gruvbox_plugin_hi_groups 1) - (vim.cmd "colorscheme gruvbox8") - ((. (require :dots.utils) :highlight) :SignColumn {:bg (. (require :dots.colors) :dark0)}))} - ;(req dots.utils.highlight :SignColumn {:bg (. (require :dots.colors) :dark0)}))} - ;(req dots.utils.highlight :LspDiagnosticsUnderlineError {:gui "underline"}))} - - - :nvim-telescope/telescope.nvim {:config #(require "dots.plugins.telescope") - :cmd ["Telescope"] - :requires [:nvim-lua/popup.nvim - :nvim-lua/plenary.nvim]} - - - :nvim-telescope/telescope-packer.nvim {} - - - - + :norcalli/nvim.lua {} + :lifepillar/vim-gruvbox8 {:opt false :config #(require "dots.plugins.gruvbox8")} :kyazdani42/nvim-web-devicons {} + :folke/which-key.nvim {} + :Famiu/feline.nvim {:opt false :config #(require "dots.plugins.feline")} + :akinsho/nvim-bufferline.lua {:opt false :config #(require "dots.plugins.bufferline")} + + :psliwka/vim-smoothie {} + :norcalli/nvim-colorizer.lua {:opt false :config #(require "dots.plugins.nvim-colorizer")} + :nathanaelkane/vim-indent-guides {:cmd ["IndentGuidesToggle"]} + + :tweekmonster/startuptime.vim {:cmd ["StartupTime"]} + :folke/persistence.nvim {:opt false :config #(require "dots.plugins.persistence")} + :folke/zen-mode.nvim {:cmd ["ZenMode"] :config #(require "dots.plugins.zen-mode")} + :folke/twilight.nvim {:config #(require "dots.plugins.twilight")} + :nvim-telescope/telescope.nvim {:config #(require "dots.plugins.telescope") + :cmd ["Telescope"] + :requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim]} + + ; editing and movement <<< + :jiangmiao/auto-pairs {} + :tpope/vim-repeat {} + :preservim/nerdcommenter {} + :godlygeek/tabular {:cmd ["Tabularize"]} + :tpope/vim-surround {} + :hauleth/sad.vim {} + :wellle/targets.vim {} ; more text objects. IE: cin (change in next parens). generally better handling of surrounding objects. + :mg979/vim-visual-multi {} + :tommcdo/vim-exchange {} + :justinmk/vim-sneak {:opt false :config #(require "dots.plugins.sneak")} + ; >>> + ; treesitter <<< :nvim-treesitter/nvim-treesitter {:config #(require "dots.plugins.treesitter") :event ["BufEnter"] :run ":TSUpdate"} - :JoosepAlviste/nvim-ts-context-commentstring {:event ["BufEnter"] :requires [:nvim-treesitter/nvim-treesitter]} :nvim-treesitter/playground {:event ["BufEnter"] :requires [:nvim-treesitter/nvim-treesitter]} - :jiangmiao/auto-pairs {} - - :folke/which-key.nvim {} - - :Olical/aniseed {:branch "develop"} - - :norcalli/nvim.lua {} - - :Famiu/feline.nvim {:opt false :config #(require "dots.plugins.feline")} - :akinsho/nvim-bufferline.lua {:opt false :config #(require "dots.plugins.bufferline")} - - :sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"] - :config #(require "dots.plugins.diffview")} - - :tweekmonster/startuptime.vim {:cmd ["StartupTime"]} - - :tpope/vim-repeat {} - - - :lewis6991/gitsigns.nvim {:after ["vim-gruvbox8"] - :opt false - :config #(require "dots.plugins.gitsigns")} - - - - :tpope/vim-fugitive {} - - :preservim/nerdcommenter {} - - :godlygeek/tabular {:cmd ["Tabularize"]} ; :Tab /regex can align code on occurrences of the given regex. I.e. :Tab /= aligns all = signs in a block. - - :tpope/vim-surround {} - - :nathanaelkane/vim-indent-guides {} ; Can be toggled using ig (intent-guides) - - ; to select current word. to select next occurrence. - ; with multiple lines selected in Visual mode, to insert cursor in each line. I not i to insert in Visual-mode. - :terryma/vim-multiple-cursors {} - :mg979/vim-visual-multi {} - - :hauleth/sad.vim {} ; Use siw instead of ciw. when using . afterwards, will find the next occurrence of the changed word and change it too - - :wellle/targets.vim {} ; more text objects. IE: cin (change in next parens). generally better handling of surrounding objects. - - ; ( use :iamcco/markdown-preview.nvim {:run vim.fn.mkdp#util#install}) - - + ; >>> + + ; debugger <<< :rcarriga/nvim-dap-ui {:opt false :config #((. (require :dapui) :setup)) :requires [:mfussenegger/nvim-dap]} @@ -139,10 +87,25 @@ :nvim-telescope/telescope-dap.nvim {:requires [:mfussenegger/nvim-dap :nvim-telescope/telescope.nvim]} - ; code-related ----------------------------------------- <<< - + ; >>> + ; git stuff <<< + :sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"] + :config #(require "dots.plugins.diffview")} + :lewis6991/gitsigns.nvim {:after ["vim-gruvbox8"] + :opt false + :config #(require "dots.plugins.gitsigns")} + + :ruanyl/vim-gh-line {} + :rhysd/conflict-marker.vim {} + :tpope/vim-fugitive {} + :TimUntersberger/neogit {:config #(require "dots.plugins.neogit") + :cmd ["Neogit"]} + + ; >>> + + ; lsp <<< :ray-x/lsp_signature.nvim {:events [:BufEnter]} :elkowar/trouble.nvim {:config #(require "dots.plugins.trouble") @@ -161,6 +124,14 @@ ;:branch "coq" ;:ms-jpq/coq.artifacts {:branch "artifacts"} + :tami5/lspsaga.nvim {:after "vim-gruvbox8" + :opt false + :commit "373bc031b39730cbfe492533c3acfac36007899a" + :config #(require "dots.plugins.lspsaga")} + + ; >>> + + ; cmp <<< :hrsh7th/vim-vsnip {} :hrsh7th/cmp-vsnip {} @@ -178,43 +149,31 @@ :hrsh7th/cmp-calc :hrsh7th/cmp-path] :config #(require "dots.plugins.cmp")} + ; >>> - - - - :tami5/lspsaga.nvim {:after "vim-gruvbox8" - :opt false - :commit "373bc031b39730cbfe492533c3acfac36007899a" - :config #(require "dots.plugins.lspsaga")} - - - :sbdchd/neoformat {} - - - ;; -------------------- - - :Olical/conjure {} - :ciaranm/detectindent {:opt false :config #(require "dots.plugins.detect-indent")} - :pechorin/any-jump.vim {} - :justinmk/vim-sneak {:opt false :config #(require "dots.plugins.sneak")} - :psliwka/vim-smoothie {} + ; code-related ----------------------------------------- <<< + :tpope/vim-sleuth {} :editorconfig/editorconfig-vim {} - :tommcdo/vim-exchange {} + :pechorin/any-jump.vim {} + :sbdchd/neoformat {} + :elkowar/antifennel-nvim {:opt false :config #(set vim.g.antifennel_executable "/home/leon/tmp/antifennel/antifennel")} + :Olical/conjure {:ft ["fennel"]} :eraserhd/parinfer-rust {:run "cargo build --release"} - :elkowar/yuck.vim {} - :cespare/vim-toml {} + + :kmonad/kmonad-vim {} + :elkowar/yuck.vim {:ft ["yuck"]} + :cespare/vim-toml {:ft ["toml"]} :bduggan/vim-raku {:ft ["raku"]} :LnL7/vim-nix {:ft ["nix"]} :kevinoid/vim-jsonc {} - :norcalli/nvim-colorizer.lua {:opt false :config #(require "dots.plugins.nvim-colorizer")} - :pangloss/vim-javascript {} ; syntax highlighting JS - :ianks/vim-tsx {} - :leafgarland/typescript-vim {} + :pangloss/vim-javascript {:ft ["javascript"]} ; syntax highlighting JS + :ianks/vim-tsx {:ft ["typescript-react"]} + :leafgarland/typescript-vim {:ft ["typescript" "typescript-react" "javascript"]} :HerringtonDarkholme/yats.vim {} ; typescript syntax highlighting :mxw/vim-jsx {} :mattn/emmet-vim {:opt false :config #(require "dots.plugins.emmet")} - :purescript-contrib/purescript-vim {} + :purescript-contrib/purescript-vim {:ft ["purescript"]} :derekelkins/agda-vim {:ft ["agda"]} :neovimhaskell/haskell-vim { :ft ["haskell"]} @@ -232,8 +191,7 @@ :qnighy/lalrpop.vim {} :edwinb/idris2-vim {:ft ["idris2"]} :vmchale/ats-vim {:ft ["ats" "dats" "sats"]} - :google/vim-jsonnet {} - :bakpakin/fennel.vim {} + :bakpakin/fennel.vim {:ft ["fennel"]} :evanleck/vim-svelte {}) diff --git a/nvim/.config/nvim/fnl/dots/plugins/detect-indent.fnl b/nvim/.config/nvim/fnl/dots/plugins/detect-indent.fnl index 93589a0..57c1d66 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/detect-indent.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/detect-indent.fnl @@ -1,7 +1,7 @@ -(module dots.plugins.detect-indent - {}) +(module dots.plugins.detect-indent) + -(vim.cmd "autocmd! BufReadPost * :DetectIndent") +;(vim.cmd "autocmd! BufReadPost * :DetectIndent") (set vim.g.detectindent_preferred_expandtab 1) (set vim.g.detectindent_preferred_indent 2) diff --git a/nvim/.config/nvim/fnl/dots/plugins/gruvbox8.fnl b/nvim/.config/nvim/fnl/dots/plugins/gruvbox8.fnl new file mode 100644 index 0000000..af3a816 --- /dev/null +++ b/nvim/.config/nvim/fnl/dots/plugins/gruvbox8.fnl @@ -0,0 +1,15 @@ +(module dots.plugins.gruvbox8 + {autoload {utils dots.utils + colors dots.colors}}) + +(set vim.g.gruvbox_italics 0) +(set vim.g.gruvbox_italicise_strings 0) +(set vim.g.gruvbox_filetype_hi_groups 1) +(set vim.g.gruvbox_plugin_hi_groups 1) + +(vim.cmd "colorscheme gruvbox8") + +(utils.highlight :SignColumn {:bg colors.dark0}) + +;(utils.highlight :SignColumn {:bg (. (require :dots.colors) :dark0)}))} +;(utils.highlight :LspDiagnosticsUnderlineError {:gui "underline"}))}