diff --git a/ftplugin/yaml.lua b/ftplugin/yaml.lua new file mode 100644 index 0000000..57e3c47 --- /dev/null +++ b/ftplugin/yaml.lua @@ -0,0 +1 @@ +require("helpers").set_tab(4) diff --git a/lua/plugins/config.lua b/lua/plugins/config.lua index cf15d2b..836d308 100644 --- a/lua/plugins/config.lua +++ b/lua/plugins/config.lua @@ -184,16 +184,15 @@ end function M.nvim_treesitter() local highlight_disable = { - --tsx = true, cpp = true, + --javascript = true, } - local rainbow_disable = vim.tbl_extend("force", highlight_disable, { - html = true, - javascript = true, - typescript = true, - --svelte = true, - query = true, - }) + --local rainbow_disable = vim.tbl_extend("force", highlight_disable, { + -- html = true, + -- typescript = true, + -- tsx = true, + -- svelte = true, + --}) local too_many_lines = function(bufnr) return vim.api.nvim_buf_line_count(bufnr) > 5000 @@ -210,7 +209,8 @@ function M.nvim_treesitter() "svelte", "vim", "css", - "scheme", + "html", + "query", }, highlight = { enable = true, @@ -219,14 +219,14 @@ function M.nvim_treesitter() end, --additional_vim_regex_highlighting = { "htmldjango", "html" }, }, - rainbow = { - enable = true, - disable = function(lang, bufnr) - return rainbow_disable[lang] or too_many_lines(bufnr) - end, - extended_mode = false, - max_file_lines = nil, - }, + --rainbow = { + -- enable = true, + -- disable = function(lang, bufnr) + -- return rainbow_disable[lang] or too_many_lines(bufnr) + -- end, + -- extended_mode = false, + -- max_file_lines = nil, + --}, indent = { enable = true, }, @@ -324,6 +324,10 @@ function M.null_ls() -- null_ls.builtins.formatting.sqlfluff.with(sqlfluff_args), -- null_ls.builtins.formatting.sqlfmt, null_ls.builtins.formatting.sql_formatter, + + -- elixir + null_ls.builtins.diagnostics.credo, + null_ls.builtins.formatting.mix, } null_ls.setup({ sources = sources, @@ -410,6 +414,21 @@ function M.lsp_zero() local lsp = require("lsp-zero") lsp.preset("recommended") + lsp.ensure_installed({ + "pyright", + "lua_ls", + "bashls", + "gopls", + + -- js web shit + "html", + "cssls", + "tsserver", + "svelte", + "angularls", + "tailwindcss", + }) + lsp.configure("pyright", { root_dir = lsp_config_defaults().root_dir, }) diff --git a/lua/plugins/startup.lua b/lua/plugins/startup.lua index 924d163..c230712 100644 --- a/lua/plugins/startup.lua +++ b/lua/plugins/startup.lua @@ -1,95 +1,103 @@ require("packer").startup(function(use) - use("wbthomason/packer.nvim") + use("wbthomason/packer.nvim") - -- NAVIGATION - use("phaazon/hop.nvim") + -- NAVIGATION + use("phaazon/hop.nvim") - -- VIM THEMING - --use("navarasu/onedark.nvim") - use("folke/tokyonight.nvim") + -- VIM THEMING + --use("navarasu/onedark.nvim") + use("folke/tokyonight.nvim") - -- FILE MANAGEMENT - use("junegunn/fzf") - use("junegunn/fzf.vim") - use("kevinhwang91/rnvimr") - use("vijaymarupudi/nvim-fzf") - use("vijaymarupudi/nvim-fzf-commands") + -- FILE MANAGEMENT + use("junegunn/fzf") + use("junegunn/fzf.vim") + use("kevinhwang91/rnvimr") + use("vijaymarupudi/nvim-fzf") + use("vijaymarupudi/nvim-fzf-commands") - -- SESSION - use("ThePrimeagen/harpoon") - use("nvim-lua/plenary.nvim") - use("rmagatti/auto-session") - use("mbbill/undotree") + -- SESSION + use("ThePrimeagen/harpoon") + use("nvim-lua/plenary.nvim") + use({ + "rmagatti/auto-session", + config = function() + require("auto-session").setup({ + log_level = "error", + auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" }, + }) + end, + }) + use("mbbill/undotree") - -- GIT - use("tpope/vim-fugitive") - use("stsewd/fzf-checkout.vim") - use("lewis6991/gitsigns.nvim") + -- GIT + use("tpope/vim-fugitive") + use("stsewd/fzf-checkout.vim") + use("lewis6991/gitsigns.nvim") - -- EDITOR - use("lukas-reineke/indent-blankline.nvim") - use({ - "nvim-lualine/lualine.nvim", - requires = { "kyazdani42/nvim-web-devicons", opt = true }, - }) + -- EDITOR + use("lukas-reineke/indent-blankline.nvim") + use({ + "nvim-lualine/lualine.nvim", + requires = { "kyazdani42/nvim-web-devicons", opt = true }, + }) - -- SNIPPETS - --use("SirVer/ultisnips") - --use("honza/vim-snippets") - --use("L3MON4D3/LuaSnip") -- Snippets plugin + -- SNIPPETS + --use("SirVer/ultisnips") + --use("honza/vim-snippets") + --use("L3MON4D3/LuaSnip") -- Snippets plugin - -- LSP - use("p00f/nvim-ts-rainbow") - use({ - "nvim-treesitter/nvim-treesitter", - run = ":TSUpdate", - }) - use("nvim-treesitter/nvim-treesitter-context") - use("nvim-treesitter/playground") - use("jose-elias-alvarez/null-ls.nvim") - use("windwp/nvim-autopairs") + -- LSP + --use("p00f/nvim-ts-rainbow") + use({ + "nvim-treesitter/nvim-treesitter", + run = ":TSUpdate", + }) + use("nvim-treesitter/nvim-treesitter-context") + use("nvim-treesitter/playground") + use("jose-elias-alvarez/null-ls.nvim") + use("windwp/nvim-autopairs") - --use("neovim/nvim-lspconfig") - --use("williamboman/nvim-lsp-installer") - --use("jose-elias-alvarez/nvim-lsp-ts-utils") - --use({ - -- "hrsh7th/cmp-nvim-lsp", - -- requires = "quangnguyen30192/cmp-nvim-ultisnips", - --}) - --use("hrsh7th/nvim-cmp") + --use("neovim/nvim-lspconfig") + --use("williamboman/nvim-lsp-installer") + --use("jose-elias-alvarez/nvim-lsp-ts-utils") + --use({ + -- "hrsh7th/cmp-nvim-lsp", + -- requires = "quangnguyen30192/cmp-nvim-ultisnips", + --}) + --use("hrsh7th/nvim-cmp") - use({ - "VonHeikemen/lsp-zero.nvim", - branch = "v1.x", - requires = { - -- LSP Support - { "neovim/nvim-lspconfig" }, -- Required - { "williamboman/mason.nvim" }, -- Optional - { "williamboman/mason-lspconfig.nvim" }, -- Optional + use({ + "VonHeikemen/lsp-zero.nvim", + branch = "v1.x", + requires = { + -- LSP Support + { "neovim/nvim-lspconfig" }, -- Required + { "williamboman/mason.nvim" }, -- Optional + { "williamboman/mason-lspconfig.nvim" }, -- Optional - -- Autocompletion - { "hrsh7th/nvim-cmp" }, -- Required - { "hrsh7th/cmp-nvim-lsp" }, -- Required - { "hrsh7th/cmp-buffer" }, -- Optional - { "hrsh7th/cmp-path" }, -- Optional - { "saadparwaiz1/cmp_luasnip" }, -- Optional - { "hrsh7th/cmp-nvim-lua" }, -- Optional + -- Autocompletion + { "hrsh7th/nvim-cmp" }, -- Required + { "hrsh7th/cmp-nvim-lsp" }, -- Required + { "hrsh7th/cmp-buffer" }, -- Optional + { "hrsh7th/cmp-path" }, -- Optional + { "saadparwaiz1/cmp_luasnip" }, -- Optional + { "hrsh7th/cmp-nvim-lua" }, -- Optional - -- Snippets - { "L3MON4D3/LuaSnip" }, -- Required - { "rafamadriz/friendly-snippets" }, -- Optional - }, - }) + -- Snippets + { "L3MON4D3/LuaSnip" }, -- Required + { "rafamadriz/friendly-snippets" }, -- Optional + }, + }) - -- JS - use("HerringtonDarkholme/yats.vim") - use("chemzqm/vim-jsx-improve") - use("yuezk/vim-js") -- js - use("maxmellon/vim-jsx-pretty") -- react/tsx syntax highlight & indent + -- JS + use("HerringtonDarkholme/yats.vim") + use("chemzqm/vim-jsx-improve") + use("yuezk/vim-js") -- js + use("maxmellon/vim-jsx-pretty") -- react/tsx syntax highlight & indent - -- HTML/CSS - use("mattn/emmet-vim") + -- HTML/CSS + use("mattn/emmet-vim") - -- ZIG - use("ziglang/zig.vim") + -- ZIG + use("ziglang/zig.vim") end)