Compare commits
	
		
			No commits in common. "d3c45857ebf66511e02aff9278c0d052ae5eb66b" and "1f84dc1881cbe45aa4d3c6148d70f02d8f161adc" have entirely different histories.
		
	
	
		
			d3c45857eb
			...
			1f84dc1881
		
	
		| 
						 | 
					@ -1 +0,0 @@
 | 
				
			||||||
node_modules
 | 
					 | 
				
			||||||
							
								
								
									
										5
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										5
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -9,10 +9,11 @@ if not vim.loop.fs_stat(lazypath) then
 | 
				
			||||||
		"--filter=blob:none",
 | 
							"--filter=blob:none",
 | 
				
			||||||
		"https://github.com/folke/lazy.nvim.git",
 | 
							"https://github.com/folke/lazy.nvim.git",
 | 
				
			||||||
		"--branch=stable", -- latest stable release
 | 
							"--branch=stable", -- latest stable release
 | 
				
			||||||
		lazypath, })
 | 
							lazypath,
 | 
				
			||||||
 | 
						})
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
vim.opt.rtp:prepend(lazypath)
 | 
					vim.opt.rtp:prepend(lazypath)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require("lazy").setup({ { import = "plugins" }, { import = "plugins.lsp" }, { import = "plugins.themes" } })
 | 
					require("lazy").setup({ { import = "plugins" }, { import = "plugins.lsp" }, { import = "plugins.themes" } })
 | 
				
			||||||
require("lsp_setup")
 | 
					
 | 
				
			||||||
vim.cmd("colorscheme rose-pine")
 | 
					vim.cmd("colorscheme rose-pine")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,51 +0,0 @@
 | 
				
			||||||
-- enable mason and configure icons
 | 
					 | 
				
			||||||
require("mason").setup({
 | 
					 | 
				
			||||||
	ui = {
 | 
					 | 
				
			||||||
		icons = {
 | 
					 | 
				
			||||||
			package_installed = "✓",
 | 
					 | 
				
			||||||
			package_pending = "➜",
 | 
					 | 
				
			||||||
			package_uninstalled = "✗",
 | 
					 | 
				
			||||||
		},
 | 
					 | 
				
			||||||
	},
 | 
					 | 
				
			||||||
})
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
require("mason-tool-installer").setup({
 | 
					 | 
				
			||||||
	ensure_installed = {
 | 
					 | 
				
			||||||
		"prettier", -- prettier formatter
 | 
					 | 
				
			||||||
		--	"stylua", -- lua formatter
 | 
					 | 
				
			||||||
		"isort", -- python formatter
 | 
					 | 
				
			||||||
		"black", -- python formatter
 | 
					 | 
				
			||||||
		"pylint", -- python linter
 | 
					 | 
				
			||||||
		"eslint_d", -- js linter
 | 
					 | 
				
			||||||
	},
 | 
					 | 
				
			||||||
})
 | 
					 | 
				
			||||||
--#################################################################################
 | 
					 | 
				
			||||||
--#####    THESE ARE THE LANGUAGE SERVERS WE WANT
 | 
					 | 
				
			||||||
--#################################################################################
 | 
					 | 
				
			||||||
local lsps_for_install = { "eslint", "html", "cssls", "bashls", "grammarly" }
 | 
					 | 
				
			||||||
--make this table 2d to add configs
 | 
					 | 
				
			||||||
local mason_lspconfig = require("mason-lspconfig")
 | 
					 | 
				
			||||||
mason_lspconfig.setup {
 | 
					 | 
				
			||||||
	ensure_installed = lsps_for_install
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
local lspconfig = require("lspconfig")
 | 
					 | 
				
			||||||
local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
 | 
					 | 
				
			||||||
for _, lsp in pairs(lsps_for_install) do
 | 
					 | 
				
			||||||
	lspconfig[lsp].setup {
 | 
					 | 
				
			||||||
		capabilities = lsp_capabilities,
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
end
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
lspconfig.lua_ls.setup {
 | 
					 | 
				
			||||||
	capabilities = lsp_capabilities,
 | 
					 | 
				
			||||||
	settings = {
 | 
					 | 
				
			||||||
		Lua = {
 | 
					 | 
				
			||||||
			diagnostics = {
 | 
					 | 
				
			||||||
				globals = { "vim" },
 | 
					 | 
				
			||||||
			},
 | 
					 | 
				
			||||||
		},
 | 
					 | 
				
			||||||
	},
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,6 +0,0 @@
 | 
				
			||||||
return {
 | 
					 | 
				
			||||||
	"https://github.com/windwp/nvim-ts-autotag",
 | 
					 | 
				
			||||||
	config = function()
 | 
					 | 
				
			||||||
		require('nvim-ts-autotag').setup()
 | 
					 | 
				
			||||||
	end
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -7,6 +7,7 @@ return {
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		config = function()
 | 
							config = function()
 | 
				
			||||||
			local lint = require("lint")
 | 
								local lint = require("lint")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			lint.linters_by_ft = {
 | 
								lint.linters_by_ft = {
 | 
				
			||||||
				javascript = { "eslint_d" },
 | 
									javascript = { "eslint_d" },
 | 
				
			||||||
				typescript = { "eslint_d" },
 | 
									typescript = { "eslint_d" },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,13 +0,0 @@
 | 
				
			||||||
return {
 | 
					 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		"williamboman/mason.nvim",
 | 
					 | 
				
			||||||
		dependencies = { "WhoIsSethDaniel/mason-tool-installer.nvim" },
 | 
					 | 
				
			||||||
	},
 | 
					 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		"williamboman/mason-lspconfig.nvim",
 | 
					 | 
				
			||||||
	},
 | 
					 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		"neovim/nvim-lspconfig",
 | 
					 | 
				
			||||||
	},
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,35 @@
 | 
				
			||||||
 | 
					return {"neovim/nvim-lspconfig",
 | 
				
			||||||
 | 
							config = function()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
 | 
				
			||||||
 | 
					local lspconfig = require('lspconfig')
 | 
				
			||||||
 | 
					lspconfig.lua_ls.setup {
 | 
				
			||||||
 | 
						capabilities = lsp_capabilities,
 | 
				
			||||||
 | 
						settings = {
 | 
				
			||||||
 | 
							Lua = {
 | 
				
			||||||
 | 
								diagnostics = {
 | 
				
			||||||
 | 
									globals = { "vim" },
 | 
				
			||||||
 | 
								},
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
						},
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					-- lspconfig.ltex.setup {
 | 
				
			||||||
 | 
					-- 	capabilities = lsp_capabilities,
 | 
				
			||||||
 | 
					-- }
 | 
				
			||||||
 | 
					-- lspconfig.grammarly.setup {
 | 
				
			||||||
 | 
					--     	capabilities = lsp_capabilities,
 | 
				
			||||||
 | 
					-- 	filetypes = { "markdown", "tex", "text", },
 | 
				
			||||||
 | 
					--     init_options = {
 | 
				
			||||||
 | 
					--         clientId = "client_"
 | 
				
			||||||
 | 
					--     },
 | 
				
			||||||
 | 
					--     root_dir = function(fname)
 | 
				
			||||||
 | 
					--         return require'lspconfig'.util.find_git_ancestor(fname) or vim.loop.os_homedir()
 | 
				
			||||||
 | 
					--     end,
 | 
				
			||||||
 | 
					--  }
 | 
				
			||||||
 | 
					-- lspconfig.marksman.setup {
 | 
				
			||||||
 | 
					-- 	capabilities = lsp_capabilities,
 | 
				
			||||||
 | 
					-- }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,41 @@
 | 
				
			||||||
 | 
					return {
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							"williamboman/mason.nvim",
 | 
				
			||||||
 | 
							dependencies = { "WhoIsSethDaniel/mason-tool-installer.nvim" },
 | 
				
			||||||
 | 
							config = function()
 | 
				
			||||||
 | 
								-- import mason
 | 
				
			||||||
 | 
								local mason = require("mason")
 | 
				
			||||||
 | 
								local mason_tool_installer = require("mason-tool-installer")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								-- enable mason and configure icons
 | 
				
			||||||
 | 
								mason.setup({
 | 
				
			||||||
 | 
									ui = {
 | 
				
			||||||
 | 
										icons = {
 | 
				
			||||||
 | 
											package_installed = "✓",
 | 
				
			||||||
 | 
											package_pending = "➜",
 | 
				
			||||||
 | 
											package_uninstalled = "✗",
 | 
				
			||||||
 | 
										},
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
								})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
								mason_tool_installer.setup({
 | 
				
			||||||
 | 
									ensure_installed = {
 | 
				
			||||||
 | 
										"prettier", -- prettier formatter
 | 
				
			||||||
 | 
										"stylua", -- lua formatter
 | 
				
			||||||
 | 
										"isort", -- python formatter
 | 
				
			||||||
 | 
										"black", -- python formatter
 | 
				
			||||||
 | 
										"pylint", -- python linter
 | 
				
			||||||
 | 
										"eslint_d", -- js linter
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
								})
 | 
				
			||||||
 | 
							end,
 | 
				
			||||||
 | 
						},
 | 
				
			||||||
 | 
						-- {"williamboman/mason-lspconfig.nvim",
 | 
				
			||||||
 | 
						-- 	config = function()
 | 
				
			||||||
 | 
						-- 	local mason_lspconfig = require("mason-lspconfig")
 | 
				
			||||||
 | 
						-- 	mason_lspconfig.setup {
 | 
				
			||||||
 | 
						-- 	 ensure_installed = { "grammarly", "ltex" },
 | 
				
			||||||
 | 
						-- 	}
 | 
				
			||||||
 | 
						-- 	end
 | 
				
			||||||
 | 
						-- }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
					@ -1,5 +0,0 @@
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  "dependencies": {
 | 
					 | 
				
			||||||
    "eslint": "^8.57.0"
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,7 +0,0 @@
 | 
				
			||||||
<head>
 | 
					 | 
				
			||||||
  <meta charset="UTF-8" />
 | 
					 | 
				
			||||||
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 | 
					 | 
				
			||||||
  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
 | 
					 | 
				
			||||||
  <title>HTML 5 Boilerplate</title>
 | 
					 | 
				
			||||||
  <link rel="stylesheet" href="style.css" />
 | 
					 | 
				
			||||||
</head>
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,3 +0,0 @@
 | 
				
			||||||
function(){
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,3 +0,0 @@
 | 
				
			||||||
#This is a markdown file
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
There are many like it, but this is mine.
 | 
					 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
		Reference in New Issue