From 15978a0615ff3a6c24c0203e70237bf65fdd9049 Mon Sep 17 00:00:00 2001 From: Alpha Chen Date: Fri, 26 Aug 2022 08:08:01 -0700 Subject: [PATCH] reorganize nvim config --- .config/nvim | 2 +- .gitmodules | 36 +++++++++---------- nvim/{ => config}/fnl/ftplugin/fennel.fnl | 0 nvim/{ => config}/fnl/ftplugin/rust.fnl | 0 nvim/{ => config}/fnl/fzf.fnl | 0 nvim/{ => config}/fnl/init.fnl | 4 +-- nvim/{ => config}/fnl/lsp.fnl | 1 - nvim/{ => config}/init.lua | 0 .../pack/kejadlen/start/commentary | 0 .../site => nvim}/pack/kejadlen/start/fennel | 0 .../site => nvim}/pack/kejadlen/start/fzf | 0 .../site => nvim}/pack/kejadlen/start/hotpot | 0 .../pack/kejadlen/start/lightline | 0 .../pack/kejadlen/start/lspconfig | 0 .../site => nvim}/pack/kejadlen/start/navic | 0 .../pack/kejadlen/start/paramount | 0 .../site => nvim}/pack/kejadlen/start/repeat | 0 .../pack/kejadlen/start/sensible | 0 .../site => nvim}/pack/kejadlen/start/sleuth | 0 .../pack/kejadlen/start/surround | 0 .../site => nvim}/pack/kejadlen/start/tabular | 0 .../pack/kejadlen/start/tmux-navigator | 0 .../pack/kejadlen/start/treesitter | 0 .../kejadlen/start/treesitter-textobjects | 0 .../pack/kejadlen/start/unimpaired | 0 .../site => nvim}/pack/kejadlen/start/vinegar | 0 26 files changed, 21 insertions(+), 22 deletions(-) rename nvim/{ => config}/fnl/ftplugin/fennel.fnl (100%) rename nvim/{ => config}/fnl/ftplugin/rust.fnl (100%) rename nvim/{ => config}/fnl/fzf.fnl (100%) rename nvim/{ => config}/fnl/init.fnl (97%) rename nvim/{ => config}/fnl/lsp.fnl (99%) rename nvim/{ => config}/init.lua (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/commentary (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/fennel (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/fzf (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/hotpot (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/lightline (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/lspconfig (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/navic (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/paramount (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/repeat (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/sensible (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/sleuth (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/surround (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/tabular (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/tmux-navigator (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/treesitter (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/treesitter-textobjects (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/unimpaired (100%) rename {.local/share/nvim/site => nvim}/pack/kejadlen/start/vinegar (100%) diff --git a/.config/nvim b/.config/nvim index 1a65661..d81299c 120000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -/Users/alpha/.dotfiles/nvim \ No newline at end of file +/Users/alpha/.dotfiles/nvim/config \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index cb67843..21769cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -162,71 +162,71 @@ path = src/frink.alfredworkflow url = https://github.com/src/frink.alfredworkflow [submodule ".local/share/nvim/site/pack/hotpot.nvim"] - path = .local/share/nvim/site/pack/kejadlen/start/hotpot + path = nvim/pack/kejadlen/start/hotpot url = https://github.com/rktjmp/hotpot.nvim shallow = true -[submodule ".local/share/nvim/site/pack/kejadlen/start/paramount"] +[submodule "nvim/pack/kejadlen/start/paramount"] url = https://git.kejadlen.dev/alpha/vim-colors-paramount.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/vim-tmux-navigator"] - path = .local/share/nvim/site/pack/kejadlen/start/tmux-navigator + path = nvim/pack/kejadlen/start/tmux-navigator url = https://github.com/christoomey/vim-tmux-navigator.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/lightline"] - path = .local/share/nvim/site/pack/kejadlen/start/lightline + path = nvim/pack/kejadlen/start/lightline url = https://github.com/itchyny/lightline.vim.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/unimpaired"] - path = .local/share/nvim/site/pack/kejadlen/start/unimpaired + path = nvim/pack/kejadlen/start/unimpaired url = https://github.com/tpope/vim-unimpaired.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/sleuth"] - path = .local/share/nvim/site/pack/kejadlen/start/sleuth + path = nvim/pack/kejadlen/start/sleuth url = https://github.com/tpope/vim-sleuth.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/fennel"] - path = .local/share/nvim/site/pack/kejadlen/start/fennel + path = nvim/pack/kejadlen/start/fennel url = https://github.com/jaawerth/fennel.vim.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/commentary"] - path = .local/share/nvim/site/pack/kejadlen/start/commentary + path = nvim/pack/kejadlen/start/commentary url = https://github.com/tpope/vim-commentary.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/lspconfig"] - path = .local/share/nvim/site/pack/kejadlen/start/lspconfig + path = nvim/pack/kejadlen/start/lspconfig url = https://github.com/neovim/nvim-lspconfig.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/sensible"] - path = .local/share/nvim/site/pack/kejadlen/start/sensible + path = nvim/pack/kejadlen/start/sensible url = https://github.com/tpope/vim-sensible.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/vinegar"] - path = .local/share/nvim/site/pack/kejadlen/start/vinegar + path = nvim/pack/kejadlen/start/vinegar url = https://github.com/tpope/vim-vinegar.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/surround"] - path = .local/share/nvim/site/pack/kejadlen/start/surround + path = nvim/pack/kejadlen/start/surround url = https://github.com/tpope/vim-surround.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/fzf"] - path = .local/share/nvim/site/pack/kejadlen/start/fzf + path = nvim/pack/kejadlen/start/fzf url = https://github.com/junegunn/fzf.vim.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/repeat"] - path = .local/share/nvim/site/pack/kejadlen/start/repeat + path = nvim/pack/kejadlen/start/repeat url = https://github.com/tpope/vim-repeat.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/tabular"] - path = .local/share/nvim/site/pack/kejadlen/start/tabular + path = nvim/pack/kejadlen/start/tabular url = https://github.com/godlygeek/tabular.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/treesitter"] - path = .local/share/nvim/site/pack/kejadlen/start/treesitter + path = nvim/pack/kejadlen/start/treesitter url = https://github.com/nvim-treesitter/nvim-treesitter.git shallow = true [submodule ".local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects"] - path = .local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects + path = nvim/pack/kejadlen/start/treesitter-textobjects url = https://github.com/nvim-treesitter/nvim-treesitter-textobjects.git [submodule ".local/share/nvim/site/pack/kejadlen/start/navic"] - path = .local/share/nvim/site/pack/kejadlen/start/navic + path = nvim/pack/kejadlen/start/navic url = https://github.com/SmiteshP/nvim-navic.git diff --git a/nvim/fnl/ftplugin/fennel.fnl b/nvim/config/fnl/ftplugin/fennel.fnl similarity index 100% rename from nvim/fnl/ftplugin/fennel.fnl rename to nvim/config/fnl/ftplugin/fennel.fnl diff --git a/nvim/fnl/ftplugin/rust.fnl b/nvim/config/fnl/ftplugin/rust.fnl similarity index 100% rename from nvim/fnl/ftplugin/rust.fnl rename to nvim/config/fnl/ftplugin/rust.fnl diff --git a/nvim/fnl/fzf.fnl b/nvim/config/fnl/fzf.fnl similarity index 100% rename from nvim/fnl/fzf.fnl rename to nvim/config/fnl/fzf.fnl diff --git a/nvim/fnl/init.fnl b/nvim/config/fnl/init.fnl similarity index 97% rename from nvim/fnl/init.fnl rename to nvim/config/fnl/init.fnl index 3d40275..9eb6349 100644 --- a/nvim/fnl/init.fnl +++ b/nvim/config/fnl/init.fnl @@ -1,6 +1,6 @@ (vim.cmd "colorscheme paramount") -(set vim.o.foldlevel 1) +(set vim.o.foldlevel 2) (set vim.o.linebreak true) (set vim.o.list true) (set vim.o.listchars @@ -101,7 +101,7 @@ ;;; treesitter (let [configs (require :nvim-treesitter.configs) {: setup} configs] - (setup {:ensure_installed [:fennel :lua :ruby :rust :typescript] + (setup {:ensure_installed [:fennel :hcl :lua :ruby :rust :typescript] :sync_install false :highlight {:enable true :additional_vim_regex_highlighting false} ;; disabling since this is super annoying in Ruby diff --git a/nvim/fnl/lsp.fnl b/nvim/config/fnl/lsp.fnl similarity index 99% rename from nvim/fnl/lsp.fnl rename to nvim/config/fnl/lsp.fnl index a3184f9..fb06656 100644 --- a/nvim/fnl/lsp.fnl +++ b/nvim/config/fnl/lsp.fnl @@ -74,4 +74,3 @@ :settings {:rust-analyzer {:checkOnSave {:command :clippy}}}}) (tsserver.setup {:on_attach tsserver-attach}) (typeprof.setup {:on_attach on-attach})) - diff --git a/nvim/init.lua b/nvim/config/init.lua similarity index 100% rename from nvim/init.lua rename to nvim/config/init.lua diff --git a/.local/share/nvim/site/pack/kejadlen/start/commentary b/nvim/pack/kejadlen/start/commentary similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/commentary rename to nvim/pack/kejadlen/start/commentary diff --git a/.local/share/nvim/site/pack/kejadlen/start/fennel b/nvim/pack/kejadlen/start/fennel similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/fennel rename to nvim/pack/kejadlen/start/fennel diff --git a/.local/share/nvim/site/pack/kejadlen/start/fzf b/nvim/pack/kejadlen/start/fzf similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/fzf rename to nvim/pack/kejadlen/start/fzf diff --git a/.local/share/nvim/site/pack/kejadlen/start/hotpot b/nvim/pack/kejadlen/start/hotpot similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/hotpot rename to nvim/pack/kejadlen/start/hotpot diff --git a/.local/share/nvim/site/pack/kejadlen/start/lightline b/nvim/pack/kejadlen/start/lightline similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/lightline rename to nvim/pack/kejadlen/start/lightline diff --git a/.local/share/nvim/site/pack/kejadlen/start/lspconfig b/nvim/pack/kejadlen/start/lspconfig similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/lspconfig rename to nvim/pack/kejadlen/start/lspconfig diff --git a/.local/share/nvim/site/pack/kejadlen/start/navic b/nvim/pack/kejadlen/start/navic similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/navic rename to nvim/pack/kejadlen/start/navic diff --git a/.local/share/nvim/site/pack/kejadlen/start/paramount b/nvim/pack/kejadlen/start/paramount similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/paramount rename to nvim/pack/kejadlen/start/paramount diff --git a/.local/share/nvim/site/pack/kejadlen/start/repeat b/nvim/pack/kejadlen/start/repeat similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/repeat rename to nvim/pack/kejadlen/start/repeat diff --git a/.local/share/nvim/site/pack/kejadlen/start/sensible b/nvim/pack/kejadlen/start/sensible similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/sensible rename to nvim/pack/kejadlen/start/sensible diff --git a/.local/share/nvim/site/pack/kejadlen/start/sleuth b/nvim/pack/kejadlen/start/sleuth similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/sleuth rename to nvim/pack/kejadlen/start/sleuth diff --git a/.local/share/nvim/site/pack/kejadlen/start/surround b/nvim/pack/kejadlen/start/surround similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/surround rename to nvim/pack/kejadlen/start/surround diff --git a/.local/share/nvim/site/pack/kejadlen/start/tabular b/nvim/pack/kejadlen/start/tabular similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/tabular rename to nvim/pack/kejadlen/start/tabular diff --git a/.local/share/nvim/site/pack/kejadlen/start/tmux-navigator b/nvim/pack/kejadlen/start/tmux-navigator similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/tmux-navigator rename to nvim/pack/kejadlen/start/tmux-navigator diff --git a/.local/share/nvim/site/pack/kejadlen/start/treesitter b/nvim/pack/kejadlen/start/treesitter similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/treesitter rename to nvim/pack/kejadlen/start/treesitter diff --git a/.local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects b/nvim/pack/kejadlen/start/treesitter-textobjects similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/treesitter-textobjects rename to nvim/pack/kejadlen/start/treesitter-textobjects diff --git a/.local/share/nvim/site/pack/kejadlen/start/unimpaired b/nvim/pack/kejadlen/start/unimpaired similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/unimpaired rename to nvim/pack/kejadlen/start/unimpaired diff --git a/.local/share/nvim/site/pack/kejadlen/start/vinegar b/nvim/pack/kejadlen/start/vinegar similarity index 100% rename from .local/share/nvim/site/pack/kejadlen/start/vinegar rename to nvim/pack/kejadlen/start/vinegar