chore: updates

amaanq · Mar 16, 2023 · d542d2f · d542d2f
1 parent 5582870
commit d542d2f
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ inspired by his.
 - [lualine.nvim](https://github.com/nvim-lualine/lualine.nvim)
 - [LuaSnip](https://github.com/L3MON4D3/LuaSnip)
 - [mason-lspconfig.nvim](https://github.com/williamboman/mason-lspconfig.nvim)
-- [mason-null-ls.nvim](https://github.com/jayp0521/mason-null-ls.nvim)
+- [mason-null-ls.nvim](https://github.com/jay-babu/mason-null-ls.nvim)
 - [mason.nvim](https://github.com/williamboman/mason.nvim)
 - [material.nvim](https://github.com/marko-cerovac/material.nvim)
 - [medical-spell-files](https://github.com/melvio/medical-spell-files)

diff --git a/lazy-lock.json b/lazy-lock.json
diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua
@@ -47,8 +47,8 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
 })
 
 -- Set indent level for certain filetypes
-vim.api.nvim_create_autocmd({ "FileType" }, {
-	pattern = { "lua", "query", "javascript", "typescript" },
+vim.api.nvim_create_autocmd({ "FileType", "BufRead" }, {
+	pattern = { "firrtl", "lua", "javascript", "typescript", "text", "query" },
 	callback = function()
 		vim.bo.shiftwidth = 2
 		vim.bo.tabstop = 2
@@ -59,7 +59,9 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
 
 -- Tree-Sitter highlighting for filetypes not autodetected
 vim.filetype.add({
-	extension = {},
+	extension = {
+		qmldir = "qmldir",
+	},
 })
 
 -- close dap-float with <q>

diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
@@ -11,14 +11,15 @@ require("lazy").setup({
 		-- add LazyVim and import its plugins
 		{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
 		-- import any extras modules here
+		-- { import = "lazyvim.plugins.extras.coding.copilot" },
 		{ import = "lazyvim.plugins.extras.lang.typescript" },
 		{ import = "lazyvim.plugins.extras.lang.json" },
 		{ import = "lazyvim.plugins.extras.ui.mini-animate" },
 		-- import/override with your plugins
 		{ import = "plugins" },
+		{ import = "plugins.extras.coding.copilot" },
 		{ import = "plugins.extras.dev.treesitter" },
 		{ import = "plugins.extras.lang.clangd" },
-		{ import = "plugins.extras.lang.copilot" },
 		{ import = "plugins.extras.lang.csharp" },
 		{ import = "plugins.extras.lang.go" },
 		{ import = "plugins.extras.lang.java" },

diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
@@ -87,14 +87,7 @@ return {
 		end,
 	},
 	{ "projekt0n/github-nvim-theme", lazy = false },
-	{
-		"rebelot/kanagawa.nvim",
-		lazy = false,
-		config = function()
-			local kanagawa = require("kanagawa")
-			kanagawa.setup()
-		end,
-	},
+	{ "rebelot/kanagawa.nvim", lazy = false, config = true },
 	{ "Shatur/neovim-ayu", lazy = false },
 	{ "shaunsingh/oxocarbon.nvim", lazy = false },
 	{ "LunarVim/horizon.nvim", lazy = false },
@@ -103,14 +96,12 @@ return {
 		"tokyonight.nvim",
 		lazy = false,
 		priority = 1000,
-		opts = function()
+		opts = function(_, opts)
 			return {
 				style = "moon",
-				-- transparent = true,
-				-- styles = {
-				--   sidebars = "transparent",
-				--   floats = "transparent",
-				-- },
+				styles = {
+					keywords = { italic = false },
+				},
 				sidebars = {
 					"qf",
 					"vista_kind",
@@ -120,6 +111,8 @@ return {
 					"startuptime",
 					"Outline",
 				},
+				---@param hl Highlights
+				---@param c ColorScheme
 				on_highlights = function(hl, c)
 					hl.CursorLineNr = { fg = c.orange, bold = true }
 					hl.LineNr = { fg = c.orange, bold = true }
@@ -141,6 +134,13 @@ return {
 					hl.TSRainbowGreen = { fg = c.green2 }
 					hl.TSRainbowViolet = { fg = c.purple }
 					hl.TSRainbowCyan = { fg = c.cyan }
+
+					-- upcoming nvim-treesitter PR
+					hl["@string.documentation"] = { fg = c.yellow }
+					hl["@comment.documentation"] = { fg = "#636da6", italic = false, style = { italic = false } }
+
+					-- Smali
+					hl["@parameter.builtin"] = { fg = "#efc890" }
 				end,
 			}
 		end,

diff --git a/lua/plugins/extras/lang/copilot.lua → lua/plugins/extras/coding/copilot.lua b/lua/plugins/extras/lang/copilot.lua → lua/plugins/extras/coding/copilot.lua
@@ -4,11 +4,11 @@ return {
 	{
 		"zbirenbaum/copilot.lua",
 		lazy = false,
-		config = true,
+		cmd = "Copilot",
+		build = ":Copilot auth",
 		opts = {
 			panel = { enabled = false },
 			suggestion = { auto_trigger = true },
-			plugin_manager_path = vim.fn.stdpath("data") .. "/lazy",
 		},
 	},
 

diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua
@@ -56,7 +56,7 @@ return {
 			dashboard.section.buttons.val = {
 				dashboard.button("p", " " .. " Open project", "<cmd>Telescope project display_type=full<cr>"),
 				dashboard.button("e", " " .. " New file", "<cmd>ene <BAR> startinsert<cr>"),
-				dashboard.button("f", " " .. " Find file", "<cmd>cd $HOME/Projects | Telescope find_files<cr>"),
+				dashboard.button("f", " " .. " Find file", "<cmd>cd $HOME/projects | Telescope find_files<cr>"),
 				dashboard.button("r", " " .. " Recent files", "<cmd>Telescope oldfiles <cr>"),
 				dashboard.button("s", "勒" .. " Restore Session", [[:lua require("persistence").load() <cr>]]),
 				dashboard.button("c", " " .. " Config", ":e $MYVIMRC | :cd %:p:h | Telescope file_browser<cr>"),
@@ -147,7 +147,7 @@ return {
 		event = "VeryLazy",
 		opts = {
 			themes = {
-				markdown = { colorscheme = "tokyonight-storm" },
+				markdown = { colorscheme = "rose-pine" },
 				help = { colorscheme = "oxocarbon", background = "dark" },
 			},
 		},