Changed screenshot script to use flameshot instead and also fixed delay when yanking in neovim

6 files changed, 451 insertions, 72 deletions

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 805f498..daa5da0 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,65 +1,62 @@
 {
-  "LazyVim": { "branch": "main", "commit": "9b4675ddde38fdae09978bd7dbdba83ec91f4d80" },
-  "LuaSnip": { "branch": "master", "commit": "8f3d3465ba5c7ade0a8adb41eca5736f291a3fa8" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "f8b00bba94eab372e0c29605568a7ec323e30620" },
-  "catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" },
+  "LazyVim": { "branch": "main", "commit": "298a8f5c5d7d854719eaf7c2ba113f463cab411d" },
+  "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "931f9f3b7b60ec976159cb01b4a40da3829ac2fd" },
+  "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "competitest.nvim": { "branch": "master", "commit": "c3cb0e2b0916a879c4d3dcb5737e6c046dd0afc5" },
   "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" },
-  "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" },
-  "dashboard-nvim": { "branch": "master", "commit": "1c8b82c5b02bb890862538be2061e37ef801a99b" },
-  "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
-  "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" },
-  "fzf-lua": { "branch": "main", "commit": "2674675a7719e3fb2829748276d9a0b799fd2c7a" },
-  "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" },
-  "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" },
+  "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
+  "dashboard-nvim": { "branch": "master", "commit": "b5a2a4269babbcc23c2d50a859516199841714b9" },
+  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
+  "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
+  "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" },
+  "fzf-lua": { "branch": "main", "commit": "b92220ec838c195eb1c711daa69c905b1d7b8d8c" },
+  "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" },
+  "gruvbox.nvim": { "branch": "main", "commit": "f99a08abc5ab0b9b5b0e7a33211a439155c60a61" },
   "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
   "hex.nvim": { "branch": "master", "commit": "cbffd2ce4b8be089360e3c95d5909cd511d8840c" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
-  "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
+  "lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
-  "material.nvim": { "branch": "main", "commit": "772e41a7f33743224f30799a3a887dc7dd853f8d" },
-  "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" },
-  "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" },
-  "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
-  "mini.move": { "branch": "main", "commit": "251d541a8ab745e81295a53c128829cb2bff18e3" },
-  "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" },
-  "mini.surround": { "branch": "main", "commit": "a00d69be09e3fe27dfa9e5b0298410d0e148e3e2" },
-  "neoconf.nvim": { "branch": "main", "commit": "ba3503e246ea687732e51f7f9878e653e2e2039b" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
+  "mason.nvim": { "branch": "main", "commit": "0fb4e56837f13b81a972fcc0554be1327b39061e" },
+  "material.nvim": { "branch": "main", "commit": "b6407868026175fda8b2e3dfdc524a3c60222a23" },
+  "mini.move": { "branch": "main", "commit": "9670fe1d19af3d9a69ddce920c527c883ca5dc4c" },
+  "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" },
+  "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" },
+  "neoconf.nvim": { "branch": "main", "commit": "f1fd38d61d11f3b1b3e7dc75dc667f79cf2fa58b" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
-  "neogit": { "branch": "master", "commit": "0cae7abc30cb91d661f28257c331fcb5b5198e31" },
-  "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
-  "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
-  "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
-  "nvim-lint": { "branch": "master", "commit": "f098232d70cebe90e27404928c9bc19ca7a5a7b5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
-  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
-  "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
-  "nvim-treesitter": { "branch": "master", "commit": "160e5d52c841dc9261c0b2dc6f253bddbcf3d766" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },
-  "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" },
-  "oil.nvim": { "branch": "master", "commit": "f3a31eba24587bc038592103d8f7e64648292115" },
-  "onedark": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
-  "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
-  "rose-pine": { "branch": "main", "commit": "17b466e79479758b332a3cac12544a3ad2be6241" },
+  "neogit": { "branch": "master", "commit": "acdefce66f702427d820db97e00ad9d4ae63e716" },
+  "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
+  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-lint": { "branch": "master", "commit": "2f90fe977ef21db3bf3b7a1ceaf4a1e3aafb2b26" },
+  "nvim-lspconfig": { "branch": "master", "commit": "b124ef3bd4435a6db7ff03ea2f5a23e1e0487552" },
+  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-snippets": { "branch": "main", "commit": "3f711035277accc53966fe202104c2d7ca1c5717" },
+  "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" },
+  "nvim-treesitter": { "branch": "master", "commit": "b7d50e59b1b2990b3ce8761d4cf595f4b71c87e2" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" },
+  "nvim-vtsls": { "branch": "main", "commit": "719fabc328c48fa03b1f3373205fcd1f60d21dc2" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
+  "oil.nvim": { "branch": "master", "commit": "2cb39e838e9dcd8b374f09a3a87a2e5ec9d372f6" },
+  "onedark": { "branch": "master", "commit": "8e4b79b0e6495ddf29552178eceba1e147e6cecf" },
+  "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "rose-pine": { "branch": "main", "commit": "87aa437172357ad8f916942bca249ceadc6c68b1" },
   "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
-  "telescope.nvim": { "branch": "master", "commit": "35f94f0ef32d70e3664a703cefbe71bd1456d899" },
-  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
-  "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" },
-  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" },
+  "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" },
+  "tokyonight.nvim": { "branch": "main", "commit": "7e5ef71a103e7de5fe6c05f5d6ab97d1640f08cf" },
+  "trouble.nvim": { "branch": "main", "commit": "d7f69ff5638cf1864cabac54ade1b1694adfe085" },
+  "ts-comments.nvim": { "branch": "main", "commit": "e339090c076871069c00e488b11def49aaf4e413" },
   "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" },
-  "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
-  "vim-tmux-navigator": { "branch": "master", "commit": "a26954a585b02a2ac02f87145e204f8798a7cbc2" },
-  "vimtex": { "branch": "master", "commit": "23cf7649231bcd5c1f9a0c7cb3f7e7b8839f19d6" }
+  "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" },
+  "vimtex": { "branch": "master", "commit": "9665df7f51ee24aa81dbd81782e0a22480209753" }
 }
\ No newline at end of file
diff --git a/nvim/.config/nvim/lazyvim.json b/nvim/.config/nvim/lazyvim.json
index f03853f..d5de4bc 100644
--- a/nvim/.config/nvim/lazyvim.json
+++ b/nvim/.config/nvim/lazyvim.json
@@ -3,7 +3,7 @@
 
   ],
   "news": {
-    "NEWS.md": "3314"
+    "NEWS.md": "4964"
   },
-  "version": 3
+  "version": 6
 }
\ No newline at end of file
diff --git a/nvim/.config/nvim/lua/config/autocmds.lua b/nvim/.config/nvim/lua/config/autocmds.lua
index 27e9e06..8b46955 100644
--- a/nvim/.config/nvim/lua/config/autocmds.lua
+++ b/nvim/.config/nvim/lua/config/autocmds.lua
@@ -1,3 +1,24 @@
 -- Autocmds are automatically loaded on the VeryLazy event
 -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
 -- Add any additional autocmds here
+
+-- sync system clipboard while yanking
+vim.api.nvim_create_autocmd("TextYankPost", {
+  callback = function()
+    local v = vim.v.event
+    local regcontents = v.regcontents
+    vim.defer_fn(function()
+      vim.fn.setreg("+", regcontents)
+    end, 100)
+  end,
+})
+
+-- sync system clipboard to vim clipboard
+vim.api.nvim_create_autocmd("FocusGained", {
+  callback = function()
+    local loaded_content = vim.fn.getreg("+")
+    if loaded_content ~= "" then
+      vim.fn.setreg('"', loaded_content)
+    end
+  end,
+})
diff --git a/nvim/.config/nvim/lua/config/options.lua b/nvim/.config/nvim/lua/config/options.lua
index 95b371e..1b8d2a8 100644
--- a/nvim/.config/nvim/lua/config/options.lua
+++ b/nvim/.config/nvim/lua/config/options.lua
@@ -5,6 +5,7 @@
 vim.opt.ch = 0
 vim.opt.list = false
 vim.opt.confirm = false
+vim.o.clipboard = ""
 vim.o.guifont = "Monaspace argon:h12:bold" -- text below applies for VimScript
 
 -- Helper function for transparency formatting
diff --git a/nvim/.config/nvim/lua/plugins/catppuccin.lua b/nvim/.config/nvim/lua/plugins/catppuccin.lua
new file mode 100644
index 0000000..b3e8df0
--- /dev/null
+++ b/nvim/.config/nvim/lua/plugins/catppuccin.lua
@@ -0,0 +1,359 @@
+return {
+  "catppuccin/nvim",
+  name = "catppuccin",
+  lazy = false,
+  priority = 1000,
+  config = function()
+    require("catppuccin").setup({
+      background = {
+        light = "latte",
+        dark = "mocha",
+      },
+      color_overrides = {
+        latte = {
+          rosewater = "#c14a4a",
+          flamingo = "#c14a4a",
+          red = "#c14a4a",
+          maroon = "#c14a4a",
+          pink = "#945e80",
+          mauve = "#945e80",
+          peach = "#c35e0a",
+          yellow = "#b47109",
+          green = "#6c782e",
+          teal = "#4c7a5d",
+          sky = "#4c7a5d",
+          sapphire = "#4c7a5d",
+          blue = "#45707a",
+          lavender = "#45707a",
+          text = "#654735",
+          subtext1 = "#73503c",
+          subtext0 = "#805942",
+          overlay2 = "#8c6249",
+          overlay1 = "#8c856d",
+          overlay0 = "#a69d81",
+          surface2 = "#bfb695",
+          surface1 = "#d1c7a3",
+          surface0 = "#e3dec3",
+          base = "#f9f5d7",
+          mantle = "#f0ebce",
+          crust = "#e8e3c8",
+        },
+        mocha = {
+          rosewater = "#ea6962",
+          flamingo = "#ea6962",
+          red = "#ea6962",
+          maroon = "#ea6962",
+          pink = "#d3869b",
+          mauve = "#d3869b",
+          peach = "#e78a4e",
+          yellow = "#d8a657",
+          green = "#a9b665",
+          teal = "#89b482",
+          sky = "#89b482",
+          sapphire = "#89b482",
+          blue = "#7daea3",
+          lavender = "#7daea3",
+          text = "#ebdbb2",
+          subtext1 = "#d5c4a1",
+          subtext0 = "#bdae93",
+          overlay2 = "#a89984",
+          overlay1 = "#928374",
+          overlay0 = "#595959",
+          surface2 = "#4d4d4d",
+          surface1 = "#404040",
+          surface0 = "#292929",
+          base = "#1d2021",
+          mantle = "#191b1c",
+          crust = "#141617",
+        },
+      },
+      transparent_background = true,
+      show_end_of_buffer = false,
+      integration_default = false,
+      integrations = {
+        barbecue = { dim_dirname = true, bold_basename = true, dim_context = false, alt_background = false },
+        cmp = true,
+        gitsigns = true,
+        hop = true,
+        illuminate = { enabled = true },
+        native_lsp = { enabled = true, inlay_hints = { background = true } },
+        neogit = true,
+        neotree = true,
+        semantic_tokens = true,
+        treesitter = true,
+        treesitter_context = true,
+        vimwiki = true,
+        which_key = true,
+      },
+      highlight_overrides = {
+        all = function(colors)
+          return {
+            CmpItemMenu = { fg = colors.surface2 },
+            CursorLineNr = { fg = colors.text },
+            FloatBorder = { bg = colors.base, fg = colors.surface0 },
+            GitSignsChange = { fg = colors.peach },
+            LineNr = { fg = colors.overlay0 },
+            LspInfoBorder = { link = "FloatBorder" },
+            NeoTreeDirectoryIcon = { fg = colors.subtext1 },
+            NeoTreeDirectoryName = { fg = colors.subtext1 },
+            NeoTreeFloatBorder = { link = "TelescopeResultsBorder" },
+            NeoTreeGitConflict = { fg = colors.red },
+            NeoTreeGitDeleted = { fg = colors.red },
+            NeoTreeGitIgnored = { fg = colors.overlay0 },
+            NeoTreeGitModified = { fg = colors.peach },
+            NeoTreeGitStaged = { fg = colors.green },
+            NeoTreeGitUnstaged = { fg = colors.red },
+            NeoTreeGitUntracked = { fg = colors.green },
+            NeoTreeIndent = { fg = colors.surface1 },
+            NeoTreeNormal = { bg = colors.mantle },
+            NeoTreeNormalNC = { bg = colors.mantle },
+            NeoTreeRootName = { fg = colors.subtext1, style = { "bold" } },
+            NeoTreeTabActive = { fg = colors.text, bg = colors.mantle },
+            NeoTreeTabInactive = { fg = colors.surface2, bg = colors.crust },
+            NeoTreeTabSeparatorActive = { fg = colors.mantle, bg = colors.mantle },
+            NeoTreeTabSeparatorInactive = { fg = colors.crust, bg = colors.crust },
+            NeoTreeWinSeparator = { fg = colors.base, bg = colors.base },
+            NormalFloat = { bg = colors.base },
+            Pmenu = { bg = colors.mantle, fg = "" },
+            PmenuSel = { bg = colors.surface0, fg = "" },
+            TelescopePreviewBorder = { bg = colors.crust, fg = colors.crust },
+            TelescopePreviewNormal = { bg = colors.crust },
+            TelescopePreviewTitle = { fg = colors.crust, bg = colors.crust },
+            TelescopePromptBorder = { bg = colors.surface0, fg = colors.surface0 },
+            TelescopePromptCounter = { fg = colors.mauve, style = { "bold" } },
+            TelescopePromptNormal = { bg = colors.surface0 },
+            TelescopePromptPrefix = { bg = colors.surface0 },
+            TelescopePromptTitle = { fg = colors.surface0, bg = colors.surface0 },
+            TelescopeResultsBorder = { bg = colors.mantle, fg = colors.mantle },
+            TelescopeResultsNormal = { bg = colors.mantle },
+            TelescopeResultsTitle = { fg = colors.mantle, bg = colors.mantle },
+            TelescopeSelection = { bg = colors.surface0 },
+            VertSplit = { bg = colors.base, fg = colors.surface0 },
+            WhichKeyFloat = { bg = colors.mantle },
+            YankHighlight = { bg = colors.surface2 },
+            FidgetTask = { fg = colors.subtext2 },
+            FidgetTitle = { fg = colors.peach },
+
+            IblIndent = { fg = colors.surface0 },
+            IblScope = { fg = colors.overlay0 },
+
+            Boolean = { fg = colors.mauve },
+            Number = { fg = colors.mauve },
+            Float = { fg = colors.mauve },
+
+            PreProc = { fg = colors.mauve },
+            PreCondit = { fg = colors.mauve },
+            Include = { fg = colors.mauve },
+            Define = { fg = colors.mauve },
+            Conditional = { fg = colors.red },
+            Repeat = { fg = colors.red },
+            Keyword = { fg = colors.red },
+            Typedef = { fg = colors.red },
+            Exception = { fg = colors.red },
+            Statement = { fg = colors.red },
+
+            Error = { fg = colors.red },
+            StorageClass = { fg = colors.peach },
+            Tag = { fg = colors.peach },
+            Label = { fg = colors.peach },
+            Structure = { fg = colors.peach },
+            Operator = { fg = colors.peach },
+            Title = { fg = colors.peach },
+            Special = { fg = colors.yellow },
+            SpecialChar = { fg = colors.yellow },
+            Type = { fg = colors.yellow, style = { "bold" } },
+            Function = { fg = colors.green, style = { "bold" } },
+            Delimiter = { fg = colors.subtext2 },
+            Ignore = { fg = colors.subtext2 },
+            Macro = { fg = colors.teal },
+
+            TSAnnotation = { fg = colors.mauve },
+            TSAttribute = { fg = colors.mauve },
+            TSBoolean = { fg = colors.mauve },
+            TSCharacter = { fg = colors.teal },
+            TSCharacterSpecial = { link = "SpecialChar" },
+            TSComment = { link = "Comment" },
+            TSConditional = { fg = colors.red },
+            TSConstBuiltin = { fg = colors.mauve },
+            TSConstMacro = { fg = colors.mauve },
+            TSConstant = { fg = colors.text },
+            TSConstructor = { fg = colors.green },
+            TSDebug = { link = "Debug" },
+            TSDefine = { link = "Define" },
+            TSEnvironment = { link = "Macro" },
+            TSEnvironmentName = { link = "Type" },
+            TSError = { link = "Error" },
+            TSException = { fg = colors.red },
+            TSField = { fg = colors.blue },
+            TSFloat = { fg = colors.mauve },
+            TSFuncBuiltin = { fg = colors.green },
+            TSFuncMacro = { fg = colors.green },
+            TSFunction = { fg = colors.green },
+            TSFunctionCall = { fg = colors.green },
+            TSInclude = { fg = colors.red },
+            TSKeyword = { fg = colors.red },
+            TSKeywordFunction = { fg = colors.red },
+            TSKeywordOperator = { fg = colors.peach },
+            TSKeywordReturn = { fg = colors.red },
+            TSLabel = { fg = colors.peach },
+            TSLiteral = { link = "String" },
+            TSMath = { fg = colors.blue },
+            TSMethod = { fg = colors.green },
+            TSMethodCall = { fg = colors.green },
+            TSNamespace = { fg = colors.yellow },
+            TSNone = { fg = colors.text },
+            TSNumber = { fg = colors.mauve },
+            TSOperator = { fg = colors.peach },
+            TSParameter = { fg = colors.text },
+            TSParameterReference = { fg = colors.text },
+            TSPreProc = { link = "PreProc" },
+            TSProperty = { fg = colors.blue },
+            TSPunctBracket = { fg = colors.text },
+            TSPunctDelimiter = { link = "Delimiter" },
+            TSPunctSpecial = { fg = colors.blue },
+            TSRepeat = { fg = colors.red },
+            TSStorageClass = { fg = colors.peach },
+            TSStorageClassLifetime = { fg = colors.peach },
+            TSStrike = { fg = colors.subtext2 },
+            TSString = { fg = colors.teal },
+            TSStringEscape = { fg = colors.green },
+            TSStringRegex = { fg = colors.green },
+            TSStringSpecial = { link = "SpecialChar" },
+            TSSymbol = { fg = colors.text },
+            TSTag = { fg = colors.peach },
+            TSTagAttribute = { fg = colors.green },
+            TSTagDelimiter = { fg = colors.green },
+            TSText = { fg = colors.green },
+            TSTextReference = { link = "Constant" },
+            TSTitle = { link = "Title" },
+            TSTodo = { link = "Todo" },
+            TSType = { fg = colors.yellow, style = { "bold" } },
+            TSTypeBuiltin = { fg = colors.yellow, style = { "bold" } },
+            TSTypeDefinition = { fg = colors.yellow, style = { "bold" } },
+            TSTypeQualifier = { fg = colors.peach, style = { "bold" } },
+            TSURI = { fg = colors.blue },
+            TSVariable = { fg = colors.text },
+            TSVariableBuiltin = { fg = colors.mauve },
+
+            ["@annotation"] = { link = "TSAnnotation" },
+            ["@attribute"] = { link = "TSAttribute" },
+            ["@boolean"] = { link = "TSBoolean" },
+            ["@character"] = { link = "TSCharacter" },
+            ["@character.special"] = { link = "TSCharacterSpecial" },
+            ["@comment"] = { link = "TSComment" },
+            ["@conceal"] = { link = "Grey" },
+            ["@conditional"] = { link = "TSConditional" },
+            ["@constant"] = { link = "TSConstant" },
+            ["@constant.builtin"] = { link = "TSConstBuiltin" },
+            ["@constant.macro"] = { link = "TSConstMacro" },
+            ["@constructor"] = { link = "TSConstructor" },
+            ["@debug"] = { link = "TSDebug" },
+            ["@define"] = { link = "TSDefine" },
+            ["@error"] = { link = "TSError" },
+            ["@exception"] = { link = "TSException" },
+            ["@field"] = { link = "TSField" },
+            ["@float"] = { link = "TSFloat" },
+            ["@function"] = { link = "TSFunction" },
+            ["@function.builtin"] = { link = "TSFuncBuiltin" },
+            ["@function.call"] = { link = "TSFunctionCall" },
+            ["@function.macro"] = { link = "TSFuncMacro" },
+            ["@include"] = { link = "TSInclude" },
+            ["@keyword"] = { link = "TSKeyword" },
+            ["@keyword.function"] = { link = "TSKeywordFunction" },
+            ["@keyword.operator"] = { link = "TSKeywordOperator" },
+            ["@keyword.return"] = { link = "TSKeywordReturn" },
+            ["@label"] = { link = "TSLabel" },
+            ["@math"] = { link = "TSMath" },
+            ["@method"] = { link = "TSMethod" },
+            ["@method.call"] = { link = "TSMethodCall" },
+            ["@namespace"] = { link = "TSNamespace" },
+            ["@none"] = { link = "TSNone" },
+            ["@number"] = { link = "TSNumber" },
+            ["@operator"] = { link = "TSOperator" },
+            ["@parameter"] = { link = "TSParameter" },
+            ["@parameter.reference"] = { link = "TSParameterReference" },
+            ["@preproc"] = { link = "TSPreProc" },
+            ["@property"] = { link = "TSProperty" },
+            ["@punctuation.bracket"] = { link = "TSPunctBracket" },
+            ["@punctuation.delimiter"] = { link = "TSPunctDelimiter" },
+            ["@punctuation.special"] = { link = "TSPunctSpecial" },
+            ["@repeat"] = { link = "TSRepeat" },
+            ["@storageclass"] = { link = "TSStorageClass" },
+            ["@storageclass.lifetime"] = { link = "TSStorageClassLifetime" },
+            ["@strike"] = { link = "TSStrike" },
+            ["@string"] = { link = "TSString" },
+            ["@string.escape"] = { link = "TSStringEscape" },
+            ["@string.regex"] = { link = "TSStringRegex" },
+            ["@string.special"] = { link = "TSStringSpecial" },
+            ["@symbol"] = { link = "TSSymbol" },
+            ["@tag"] = { link = "TSTag" },
+            ["@tag.attribute"] = { link = "TSTagAttribute" },
+            ["@tag.delimiter"] = { link = "TSTagDelimiter" },
+            ["@text"] = { link = "TSText" },
+            ["@text.danger"] = { link = "TSDanger" },
+            ["@text.diff.add"] = { link = "diffAdded" },
+            ["@text.diff.delete"] = { link = "diffRemoved" },
+            ["@text.emphasis"] = { link = "TSEmphasis" },
+            ["@text.environment"] = { link = "TSEnvironment" },
+            ["@text.environment.name"] = { link = "TSEnvironmentName" },
+            ["@text.literal"] = { link = "TSLiteral" },
+            ["@text.math"] = { link = "TSMath" },
+            ["@text.note"] = { link = "TSNote" },
+            ["@text.reference"] = { link = "TSTextReference" },
+            ["@text.strike"] = { link = "TSStrike" },
+            ["@text.strong"] = { link = "TSStrong" },
+            ["@text.title"] = { link = "TSTitle" },
+            ["@text.todo"] = { link = "TSTodo" },
+            ["@text.todo.checked"] = { link = "Green" },
+            ["@text.todo.unchecked"] = { link = "Ignore" },
+            ["@text.underline"] = { link = "TSUnderline" },
+            ["@text.uri"] = { link = "TSURI" },
+            ["@text.warning"] = { link = "TSWarning" },
+            ["@todo"] = { link = "TSTodo" },
+            ["@type"] = { link = "TSType" },
+            ["@type.builtin"] = { link = "TSTypeBuiltin" },
+            ["@type.definition"] = { link = "TSTypeDefinition" },
+            ["@type.qualifier"] = { link = "TSTypeQualifier" },
+            ["@uri"] = { link = "TSURI" },
+            ["@variable"] = { link = "TSVariable" },
+            ["@variable.builtin"] = { link = "TSVariableBuiltin" },
+
+            ["@lsp.type.class"] = { link = "TSType" },
+            ["@lsp.type.comment"] = { link = "TSComment" },
+            ["@lsp.type.decorator"] = { link = "TSFunction" },
+            ["@lsp.type.enum"] = { link = "TSType" },
+            ["@lsp.type.enumMember"] = { link = "TSProperty" },
+            ["@lsp.type.events"] = { link = "TSLabel" },
+            ["@lsp.type.function"] = { link = "TSFunction" },
+            ["@lsp.type.interface"] = { link = "TSType" },
+            ["@lsp.type.keyword"] = { link = "TSKeyword" },
+            ["@lsp.type.macro"] = { link = "TSConstMacro" },
+            ["@lsp.type.method"] = { link = "TSMethod" },
+            ["@lsp.type.modifier"] = { link = "TSTypeQualifier" },
+            ["@lsp.type.namespace"] = { link = "TSNamespace" },
+            ["@lsp.type.number"] = { link = "TSNumber" },
+            ["@lsp.type.operator"] = { link = "TSOperator" },
+            ["@lsp.type.parameter"] = { link = "TSParameter" },
+            ["@lsp.type.property"] = { link = "TSProperty" },
+            ["@lsp.type.regexp"] = { link = "TSStringRegex" },
+            ["@lsp.type.string"] = { link = "TSString" },
+            ["@lsp.type.struct"] = { link = "TSType" },
+            ["@lsp.type.type"] = { link = "TSType" },
+            ["@lsp.type.typeParameter"] = { link = "TSTypeDefinition" },
+            ["@lsp.type.variable"] = { link = "TSVariable" },
+          }
+        end,
+        latte = function(colors)
+          return {
+            IblIndent = { fg = colors.mantle },
+            IblScope = { fg = colors.surface1 },
+
+            LineNr = { fg = colors.surface1 },
+          }
+        end,
+      },
+    })
+
+    vim.api.nvim_command("colorscheme catppuccin")
+  end,
+}
diff --git a/nvim/.config/nvim/lua/plugins/main.lua b/nvim/.config/nvim/lua/plugins/main.lua
index c19c486..75c8cd1 100644
--- a/nvim/.config/nvim/lua/plugins/main.lua
+++ b/nvim/.config/nvim/lua/plugins/main.lua
@@ -10,7 +10,12 @@
 -- * override the configuration of LazyVim plugins
 return {
   -- add gruvbox
-  { "ellisonleao/gruvbox.nvim"},
+  { "ellisonleao/gruvbox.nvim",
+    config = true,
+    opts = {
+      transparent_mode = true,
+    }
+  },
   -- Using Packer
   { 'navarasu/onedark.nvim' , name = 'onedark',
     opts = {
@@ -24,13 +29,6 @@ return {
     }
   },
 
-  { "catppuccin/nvim", name = "catppuccin", priority = 1000,
-    opts = {
-      flavour = "mocha",
-      transparent_background = true,
-    }
-  },
-
   {
     "windwp/nvim-ts-autotag",
   },
@@ -38,6 +36,7 @@ return {
   -- tmux navigator
 {
   "christoomey/vim-tmux-navigator",
+  lazy = true,
   cmd = {
     "TmuxNavigateLeft",
     "TmuxNavigateDown",
@@ -115,8 +114,9 @@ return {
   {
     "LazyVim/LazyVim",
     opts = {
+      colorscheme = "gruvbox",
       -- colorscheme = "onedark",
-      colorscheme = "catppuccin-mocha",
+      -- colorscheme = "catppuccin",
       -- colorscheme = "material-deep-ocean",
       -- colorscheme = "tokyonight-night",
     },
@@ -302,6 +302,7 @@ return {
     },
     ---@class PluginLspOpts
     opts = {
+      inlay_hints = { enabled = false },
       ---@type lspconfig.options
       servers = {
         -- tsserver will be automatically installed with mason and loaded with lspconfig
@@ -456,24 +457,24 @@ return {
       local cmp = require("cmp")
 
       opts.mapping = vim.tbl_extend("force", opts.mapping, {
-        ["<A-j>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-            -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
-            -- this way you will only jump inside the snippet region
-          elseif luasnip.expand_or_jumpable() then
+        ["<C-k>"] = cmp.mapping(function(fallback)
+          -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable()
+          -- this way you will only jump inside the snippet region
+          if luasnip.expand_or_jumpable() then
             luasnip.expand_or_jump()
+          elseif cmp.visible() then
+            cmp.select_next_item()
           elseif has_words_before() then
             cmp.complete()
           else
             fallback()
           end
         end, { "i", "s" }),
-        ["<A-k>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif luasnip.jumpable(-1) then
+        ["<C-j>"] = cmp.mapping(function(fallback)
+          if luasnip.jumpable(-1) then
             luasnip.jump(-1)
+          elseif cmp.visible() then
+            cmp.select_prev_item()
           else
             fallback()
           end