diff options
| -rw-r--r-- | .luarc.json | 253 | ||||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | lua/getchoo/filetypes.lua | 8 | ||||
| -rw-r--r-- | lua/getchoo/init.lua | 9 | ||||
| -rw-r--r-- | lua/getchoo/keybinds.lua | 17 | ||||
| -rw-r--r-- | lua/getchoo/plugins/general.lua | 75 | ||||
| -rw-r--r-- | lua/getchoo/plugins/init.lua | 5 | ||||
| -rw-r--r-- | lua/getchoo/plugins/lazy.lua | 41 | ||||
| -rw-r--r-- | lua/getchoo/plugins/lsp.lua | 22 | ||||
| -rw-r--r-- | lua/getchoo/plugins/ui.lua | 40 |
10 files changed, 177 insertions, 300 deletions
diff --git a/.luarc.json b/.luarc.json deleted file mode 100644 index 694db71..0000000 --- a/.luarc.json +++ /dev/null @@ -1,253 +0,0 @@ -{ - "workspace.library": [ - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/bufferline.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/catppuccin-nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp-buffer", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp-nvim-lsp", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp-path", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp_luasnip", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/editorconfig.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/fidget.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/gitsigns.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/leap.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/lualine.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/luasnip", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/null-ls.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/nvim-autopairs", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/nvim-cmp", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/nvim-lspconfig", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/nvim-tree.lua", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/nvim-treesitter", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/nvim-web-devicons", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/plenary.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/telescope.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/trouble.nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vim-just", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ada", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-agda", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-arduino", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-astro", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-awk", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-bash", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-bass", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-beancount", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-bibtex", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-bicep", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-bitbake", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-blueprint", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-c", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-c_sharp", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-cairo", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-capnp", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-chatito", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-clojure", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-cmake", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-comment", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-commonlisp", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-cooklang", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-corn", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-cpon", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-cpp", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-css", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-csv", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-cuda", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-cue", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-d", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-dart", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-devicetree", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-dhall", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-diff", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-dockerfile", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-dot", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-doxygen", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-dtd", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ebnf", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-eex", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-elixir", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-elm", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-elsa", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-elvish", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-embedded_template", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-erlang", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-fennel", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-firrtl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-fish", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-foam", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-forth", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-fortran", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-fsh", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-func", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-fusion", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gdscript", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-git_config", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-git_rebase", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gitattributes", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gitcommit", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gitignore", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gleam", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-glimmer", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-glsl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-go", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-godot_resource", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gomod", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gosum", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gowork", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-gpg", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-graphql", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-groovy", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hack", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hare", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-haskell", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-haskell_persistent", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hcl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-heex", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hjson", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hlsl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hocon", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hoon", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-html", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-htmldjango", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-http", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-hurl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ini", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ispc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-janet_simple", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-java", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-javascript", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-jq", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-jsdoc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-json", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-json5", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-jsonc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-jsonnet", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-julia", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-kdl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-kotlin", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-lalrpop", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-latex", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ledger", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-llvm", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-lua", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-luadoc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-luap", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-luau", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-m68k", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-make", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-markdown", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-markdown_inline", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-matlab", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-menhir", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-mermaid", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-meson", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-mlir", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-nickel", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ninja", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-nix", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-norg", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-objc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ocaml", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ocaml_interface", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ocamllex", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-odin", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-org", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-pascal", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-passwd", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-pem", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-perl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-php", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-phpdoc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-pioasm", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-po", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-poe_filter", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-pony", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-prisma", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-promql", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-proto", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-prql", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-psv", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-pug", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-puppet", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-pymanifest", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-python", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ql", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-qmldir", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-qmljs", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-query", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-r", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-racket", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-rasi", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-re2c", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-regex", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-rego", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-requirements", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-rnoweb", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-robot", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ron", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-rst", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ruby", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-rust", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-scala", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-scfg", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-scheme", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-scss", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-slint", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-smali", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-smithy", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-solidity", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-sparql", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-sql", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-squirrel", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-starlark", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-strace", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-supercollider", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-surface", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-svelte", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-swift", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-sxhkdrc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-systemtap", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-t32", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-tablegen", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-teal", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-terraform", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-thrift", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-tiger", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-tlaplus", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-todotxt", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-toml", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-tsv", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-tsx", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-turtle", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-twig", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-typescript", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-ungrammar", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-usd", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-uxntal", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-v", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-vala", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-verilog", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-vhs", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-vim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-vimdoc", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-vue", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-wgsl", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-wgsl_bevy", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-wing", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-xml", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-yaml", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-yang", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-yuck", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/vimplugin-treesitter-grammar-zig", - "/home/seth/.config/nvim", - "/nix/store/grcfjxsgxjajc1ws6ip2jkkhd238dx77-neovim-unwrapped-0.9.1/share/nvim/runtime", - "/nix/store/grcfjxsgxjajc1ws6ip2jkkhd238dx77-neovim-unwrapped-0.9.1/lib/nvim", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/catppuccin-nvim/after", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp-buffer/after", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp-nvim-lsp/after", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp-path/after", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/cmp_luasnip/after", - "/nix/store/mlqag16rr51xl6dhwywh464h50grdg6n-vim-pack-dir/pack/myNeovimPackages/start/editorconfig.nvim/after", - "/home/seth/.cache/nvim/catppuccin-nvim", - "${3rd}/luassert/library" - ] -}
\ No newline at end of file @@ -20,6 +20,13 @@ forAllSystems = fn: lib.genAttrs systems (sys: fn nixpkgs.legacyPackages.${sys}); in { + checks = forAllSystems (pkgs: { + stylua = pkgs.runCommand "stylua-check" {nativeBuildInputs = [pkgs.stylua];} '' + stylua -c ${self} + touch $out + ''; + }); + devShells = forAllSystems (pkgs: { default = import ./shell.nix {inherit pkgs;}; }); diff --git a/lua/getchoo/filetypes.lua b/lua/getchoo/filetypes.lua deleted file mode 100644 index cb62635..0000000 --- a/lua/getchoo/filetypes.lua +++ /dev/null @@ -1,8 +0,0 @@ -local filetypes = { - filename = { - PKGBUILD = "text", - [".makepkg.conf"] = "text", - }, -} - -vim.filetype.add(filetypes) diff --git a/lua/getchoo/init.lua b/lua/getchoo/init.lua index 94a02dc..461d217 100644 --- a/lua/getchoo/init.lua +++ b/lua/getchoo/init.lua @@ -6,7 +6,8 @@ opt.tabstop = 2 opt.shiftwidth = 2 opt.expandtab = false opt.smartindent = true -opt.wrap = false +opt.wrap = true +opt.relativenumer = true -- appearance opt.syntax = "on" @@ -14,8 +15,4 @@ cmd("filetype plugin indent on") opt.termguicolors = true require("getchoo.keybinds") -require("getchoo.filetypes") - -if vim.g.no_plugins then - require("getchoo.plugins") -end +require("getchoo.plugins") diff --git a/lua/getchoo/keybinds.lua b/lua/getchoo/keybinds.lua index a71f606..7dab12e 100644 --- a/lua/getchoo/keybinds.lua +++ b/lua/getchoo/keybinds.lua @@ -5,9 +5,20 @@ local set = function(mode, key, vimcmd) vim.keymap.set(mode, key, vimcmd, opts) end -set("n", "<leader>t", function() - vim.cmd("NvimTreeToggle") -end) +if pcall(require, "neo-tree.command") then + set("n", "<leader>t", function() + require("neo-tree.command").execute({ + toggle = true, + dir = vim.loop.cwd(), + }) + end) +end + +if pcall(require, "flash") then + set({ "n", "o", "x" }, "s", function() + require("flash").jump() + end) +end for i = 1, 9 do set("n", "<leader>" .. i, function() diff --git a/lua/getchoo/plugins/general.lua b/lua/getchoo/plugins/general.lua index 3c89ea6..f9a0c2c 100644 --- a/lua/getchoo/plugins/general.lua +++ b/lua/getchoo/plugins/general.lua @@ -1,8 +1,3 @@ ----- autopairs -require("nvim-autopairs").setup({ - disable_filetype = { "TeleScopePrompt" }, -}) - ---- catppuccin local compile_path = vim.fn.stdpath("cache") .. "/catppuccin-nvim" vim.fn.mkdir(compile_path, "p") @@ -12,14 +7,13 @@ require("catppuccin").setup({ compile_path = compile_path, flavour = "mocha", -- mocha, macchiato, frappe, latte integrations = { - barbar = true, cmp = true, + flash = true, gitsigns = true, - leap = true, native_lsp = { enabled = true, }, - nvimtree = true, + neotree = true, treesitter_context = true, treesitter = true, telescope = true, @@ -38,29 +32,76 @@ require("bufferline").setup({ mode = "buffers", numbers = "ordinal", separator_style = "slant", + offsets = { + { + filetype = "neo-tree", + text = "neo-tree", + highlight = "Directory", + text_align = "left", + }, + }, }, }) ---- gitsigns require("gitsigns").setup() ----- leap -require("leap").add_default_mappings() +---- indent-blankline.nvim +require("indent_blankline").setup({ + filetype_exclude = { + "help", + "neo-tree", + "Trouble", + "lazy", + "mason", + "notify", + "toggleterm", + }, + show_trailing_blankline_indent = false, + show_current_context = false, +}) ---- lualine require("lualine").setup({ options = { theme = "catppuccin", }, - extensions = { "nvim-tree" }, + extensions = { "neo-tree", "trouble" }, +}) + +---- mini.nvim +require("mini.pairs").setup({}) +require("mini.indentscope").setup({ + options = { try_as_border = true }, +}) + +vim.api.nvim_create_autocmd("FileType", { + pattern = { + "help", + "neo-tree", + "Trouble", + "lazy", + "mason", + "notify", + "toggleterm", + }, + callback = function() + vim.b.miniindentscope_disable = true + end, }) ---- nvim-tree -require("nvim-tree").setup() +require("neo-tree").setup({ + sources = { "filesystem", "buffers", "git_status", "document_symbols" }, + open_files_do_not_replace_types = { "terminal", "Trouble", "qf", "Outline" }, + filesystem = { + bind_to_cwd = false, + follow_current_file = { enabled = true }, + use_libuv_file_watcher = true, + }, +}) ----- treesitter -require("nvim-treesitter.configs").setup({ - auto_install = false, - highlight = { enable = true }, - indent = { enable = true }, +---- which-key +require("which-key").setup({ + plugins = { spelling = true }, }) diff --git a/lua/getchoo/plugins/init.lua b/lua/getchoo/plugins/init.lua index f0e8a44..95883c7 100644 --- a/lua/getchoo/plugins/init.lua +++ b/lua/getchoo/plugins/init.lua @@ -1,6 +1,3 @@ -if vim.g.use_lazy then - require("getchoo.plugins.lazy") -end - require("getchoo.plugins.general") require("getchoo.plugins.lsp") +require("getchoo.plugins.ui") diff --git a/lua/getchoo/plugins/lazy.lua b/lua/getchoo/plugins/lazy.lua index bdd6dc3..e11572c 100644 --- a/lua/getchoo/plugins/lazy.lua +++ b/lua/getchoo/plugins/lazy.lua @@ -17,21 +17,44 @@ vim.opt.rtp:prepend(lazy_path) require("lazy").setup({ { "akinsho/bufferline.nvim", version = "*", dependencies = "nvim-tree/nvim-web-devicons" }, { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, - "hrsh7th/nvim-cmp", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "saadparwaiz1/cmp_luasnip", - "FelipeLema/cmp-async-path", + { + "hrsh7th/nvim-cmp", + dependencies = { + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-buffer", + "saadparwaiz1/cmp_luasnip", + "FelipeLema/cmp-async-path", + "L3MON4D3/LuaSnip", + }, + }, + { "stevearc/dressing.nvim", lazy = true }, { "j-hui/fidget.nvim", tag = "legacy" }, "lewis6991/gitsigns.nvim", { "folke/flash.nvim", event = "VeryLazy" }, + "lukas-reineke/indent-blankline.nvim", { "nvim-lualine/lualine.nvim", dependencies = "nvim-tree/nvim-web-devicons" }, - "L3MON4D3/LuaSnip", - { "echasnovski/mini.pairs", event = "VeryLazy" }, + { "echasnovski/mini.nvim", version = false, event = "VeryLazy" }, + { "folke/noice.nvim", event = "VeryLazy" }, + { "MunifTanjim/nui.nvim", lazy = true }, "neovim/nvim-lspconfig", - { "nvim-tree/nvim-tree.lua", dependencies = "nvim-tree/nvim-web-devicons" }, - "nvim-treesitter/nvim-treesitter", + "rcarriga/nvim-notify", + { + "nvim-treesitter/nvim-treesitter", + dependencies = { + "JoosepAlviste/nvim-ts-context-commentstring", + }, + }, "nvim-lua/plenary.nvim", + { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-tree/nvim-web-devicons", + "MunifTanjim/nui.nvim", + }, + }, { "nvim-telescope/telescope.nvim", tag = "0.1.2" }, { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } }, + { "folke/which-key.nvim", event = "VeryLazy" }, }) diff --git a/lua/getchoo/plugins/lsp.lua b/lua/getchoo/plugins/lsp.lua index b9e8a78..82511dc 100644 --- a/lua/getchoo/plugins/lsp.lua +++ b/lua/getchoo/plugins/lsp.lua @@ -36,6 +36,9 @@ require("cmp").setup({ }), }) +---- gitsigns +require("gitsigns").setup() + ---- fidget require("fidget").setup() @@ -152,10 +155,29 @@ local formatting_on_attach = function(client, bufnr) end end +require("mini.comment").setup({ + options = { + custom_commentstring = function() + return require("ts_context_commentstring.internal").calculate_commentstring() + or vim.bo.context_commentstring + end, + }, +}) + require("null-ls").setup({ on_attach = formatting_on_attach, sources = sources.null_ls, }) +require("nvim-treesitter.configs").setup({ + auto_install = false, + highlight = { enable = true }, + indent = { enable = true }, + context_commentstring = { + enable = true, + enable_autocmd = false, + }, +}) + ---- trouble require("trouble").setup() diff --git a/lua/getchoo/plugins/ui.lua b/lua/getchoo/plugins/ui.lua new file mode 100644 index 0000000..3a0cc2e --- /dev/null +++ b/lua/getchoo/plugins/ui.lua @@ -0,0 +1,40 @@ +require("dressing") + +vim.notify = require("notify") + +vim.ui.select = function(...) + return vim.ui.select(...) +end + +vim.ui.input = function(...) + return vim.ui.input(...) +end + +require("noice").setup({ + lsp = { + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, + }, + }, + routes = { + { + filter = { + event = "msg_show", + any = { + { find = "%d+L, %d+B" }, + { find = "; after #%d+" }, + { find = "; before #%d+" }, + }, + }, + view = "mini", + }, + }, + presets = { + bottom_search = true, + command_palette = true, + long_message_to_split = true, + inc_rename = true, + }, +}) |