new nvim changesHEADmaster

4 files changed, 108 insertions, 59 deletions

diff --git a/nvim/lua/config.lua b/nvim/lua/config.lua
index 3fbccbd..2100a6c 100755
--- a/nvim/lua/config.lua
+++ b/nvim/lua/config.lua
@@ -4,6 +4,11 @@ local g = vim.g
 
 --filetypes
 vim.cmd("autocmd BufRead,BufNewFile *.m set filetype=objc")
+vim.filetype.add({
+	filename = {
+		["cgitrc"] = "dosini",
+	},
+})
 
 g.mapleader = " "
 
@@ -23,6 +28,9 @@ opt.fillchars = "eob: "
 
 --g.loaded_netrw = 1
 --g.loaded_netrwPlugin = 1
+vim.g.netrw_liststyle = 3
+
+vim.cmd("let g:netrw_banner = 0")
 
 opt.termguicolors = true
 
@@ -33,9 +41,9 @@ opt.shell = "/usr/bin/zsh"
 
 
 vim.lsp.handlers["textDocument/hover"] = function(err, result, ctx, config)
-    config = config or {}
-    config.border = "single"
-    return vim.lsp.handlers.hover(err, result, ctx, config)
+	config = config or {}
+	config.border = "single"
+	return vim.lsp.handlers.hover(err, result, ctx, config)
 end
 vim.diagnostic.config({ float = { border = "single" } })
 
@@ -82,8 +90,16 @@ map("n", "<leader>ff", builtin.find_files, {})
 map("n", "<leader>fg", builtin.live_grep, {})
 map("n", "<leader>fb", builtin.buffers, {})
 map("n", "<leader>fh", builtin.help_tags, {})
-local treeapi = require("nvim-tree.api")
-map("n", "<leader>e", treeapi.tree.toggle, {})
+--local treeapi = require("nvim-tree.api")
+--map("n", "<leader>e", treeapi.tree.toggle, {})
 
 map("n", "<A-i>", '<CMD>lua require("FTerm").toggle()<CR>')
 map("t", "<A-i>", '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>')
+
+map("n", "n", "nzzzv")
+map("n", "n", "Nzzzv")
+map("n", "<", "<gv", opts)
+map("n", ">", ">gv", opts)
+map("i", "<C-c>", "<ESC>")
+map("n", "<C-c>", ":nohl<CR>", { desc = "Clear search hl", silent = true })
+map("n", "x", "_x", opts)
diff --git a/nvim/lua/plugins/catppuccin/init.lua b/nvim/lua/plugins/catppuccin/init.lua
index c497b4d..2137248 100755
--- a/nvim/lua/plugins/catppuccin/init.lua
+++ b/nvim/lua/plugins/catppuccin/init.lua
@@ -67,24 +67,3 @@ require("lualine").setup({
 		},
 	},
 })
-
-require("nvim-tree").setup({
-	view = {
-		width = 30,
-		side = "left",
-	},
-	renderer = {
-		highlight_git = true,
-		root_folder_modifier = ":~",
-		icons = {
-			show = {
-				file = true,
-				folder = true,
-				git = true,
-			},
-		},
-	},
-	filters = {
-		dotfiles = false,
-	},
-})
diff --git a/nvim/lua/plugins/lazy/plugins.lua b/nvim/lua/plugins/lazy/plugins.lua
index f668d40..4afee21 100755
--- a/nvim/lua/plugins/lazy/plugins.lua
+++ b/nvim/lua/plugins/lazy/plugins.lua
@@ -6,28 +6,25 @@ return {
 	"williamboman/mason.nvim",
 	"stevearc/conform.nvim",
 	{
-	  "neovimhaskell/haskell-vim",
-	  ft = "haskell",
-	  init = function()
-	    vim.g.haskell_indent_disable = 0
-	    vim.g.haskell_indent_let = 2
-	    vim.g.haskell_indent_in = 1
-	    vim.g.haskell_indent_where = 2
-	    vim.g.haskell_indent_do = 2
-	    vim.g.haskell_indent_case = 2
-	    vim.g.haskell_indent_if = 2
-	  end,
+		"neovimhaskell/haskell-vim",
+		ft = "haskell",
+		init = function()
+			vim.g.haskell_indent_disable = 0
+			vim.g.haskell_indent_let = 2
+			vim.g.haskell_indent_in = 1
+			vim.g.haskell_indent_where = 2
+			vim.g.haskell_indent_do = 2
+			vim.g.haskell_indent_case = 2
+			vim.g.haskell_indent_if = 2
+		end,
 	},
 	{
 		"nvim-telescope/telescope.nvim",
-		tag = "0.1.5",
+		--tag = "0.1.5",
+		branch = "master",
 		dependencies = { "nvim-lua/plenary.nvim" },
 	},
 	{
-		"nvim-tree/nvim-tree.lua",
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-	},
-	{
 		"folke/todo-comments.nvim",
 		dependencies = { "nvim-lua/plenary.nvim" },
 		opts = {},
@@ -141,4 +138,13 @@ return {
 		lazy = false,
 		priority = 1000,
 	},
+	{
+		"Fasamii/netrw-icons.nvim",
+		dependencies = {
+			"nvim-tree/nvim-web-devicons", -- or "echasnovski/mini.icons"
+		},
+		config = function()
+			require("netrw-icons").setup()
+		end,
+	},
 }
diff --git a/nvim/lua/plugins/lsp/init.lua b/nvim/lua/plugins/lsp/init.lua
index 3745198..e21fba2 100755
--- a/nvim/lua/plugins/lsp/init.lua
+++ b/nvim/lua/plugins/lsp/init.lua
@@ -151,6 +151,21 @@ vim.lsp.config['luals'] = {
 	},
 }
 
+vim.lsp.config['html'] = {
+	cmd = { 'vscode-html-language-server', '--stdio' },
+	filetypes = { 'html' },
+	root_markers = { 'package.json', '.git' },
+	capabilities = caps,
+	init_options = {
+		provideFormatter = true,
+	},
+	settings = {
+		html = {
+			validate = { scripts = true, styles = true },
+		},
+	},
+}
+
 vim.lsp.config['cssls'] = {
 	cmd = { 'vscode-css-language-server', '--stdio' },
 	filetypes = { 'css', 'scss', 'less' },
@@ -163,6 +178,46 @@ vim.lsp.config['cssls'] = {
 	},
 }
 
+vim.lsp.config['eslint'] = {
+	cmd = { 'vscode-eslint-language-server', '--stdio' },
+	filetypes = {
+		'javascript', 'javascriptreact', 'javascript.jsx',
+		'typescript', 'typescriptreact', 'typescript.tsx',
+		'vue', 'svelte', 'astro', 'html',
+	},
+	root_markers = {
+		'eslint.config.js', 'eslint.config.mjs', 'eslint.config.cjs',
+		'.eslintrc.js', '.eslintrc.json', '.eslintrc',
+		'package.json', '.git',
+	},
+	capabilities = caps,
+	settings = {
+		validate = 'on',
+		packageManager = 'npm',
+		workingDirectory = { mode = 'auto' },
+	},
+}
+
+vim.lsp.config['jsonls'] = {
+	cmd = { 'vscode-json-language-server', '--stdio' },
+	filetypes = { 'json', 'jsonc' },
+	root_markers = { 'package.json', '.git', 'config.jsonc' },
+	capabilities = caps,
+	settings = {
+		json = {
+			validate = { enable = true },
+			format = { enable = true },
+		},
+	},
+}
+
+vim.lsp.config['markdown'] = {
+	cmd = { 'vscode-markdown-language-server', '--stdio' },
+	filetypes = { 'markdown' },
+	root_markers = { '.git' },
+	capabilities = caps,
+}
+
 vim.lsp.config['phpls'] = {
 	cmd = { 'intelephense', '--stdio' },
 	filetypes = { 'php' },
@@ -248,24 +303,17 @@ vim.lsp.config['serve_d'] = {
 	capabilities = caps,
 }
 
-vim.lsp.config['jsonls'] = {
-	cmd = { 'vscode-json-languageserver', '--stdio' },
-	filetypes = { 'json', 'jsonc' },
-	root_markers = { 'package.json', '.git', 'config.jsonc' },
-	capabilities = caps,
-}
-
 vim.lsp.config['hls'] = {
-    cmd = { 'haskell-language-server-wrapper', '--lsp' },
-    filetypes = { 'haskell', 'lhaskell' },
-    root_markers = { 'stack.yaml', 'cabal.project', 'package.yaml', 'hie.yaml', '.git' },
-    capabilities = caps,
-    settings = {
-        haskell = {
-            formattingProvider = 'ormolu',
-            plugin = { semanticTokens = { globalOn = false } },
-        },
-    },
+	cmd = { 'haskell-language-server-wrapper', '--lsp' },
+	filetypes = { 'haskell', 'lhaskell' },
+	root_markers = { 'stack.yaml', 'cabal.project', 'package.yaml', 'hie.yaml', '.git' },
+	capabilities = caps,
+	settings = {
+		haskell = {
+			formattingProvider = 'ormolu',
+			plugin = { semanticTokens = { globalOn = false } },
+		},
+	},
 }
 
 vim.lsp.config['gopls'] = {