diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 07c36e9..561e184 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -5,7 +5,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "d31323db3fa4a33d203dcb05150d98bd0153c42c" }, + "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, @@ -15,14 +15,14 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "d6e6a6fb010cc452b491704aa9ecc96a8aa2cde1" }, + "mini.nvim": { "branch": "main", "commit": "71b5694a2df4f7e3661855eb8e2814980d2e0ac9" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "a89de2e049b5f89a0ee55029d5a31213bd4de6f8" }, + "nvim-lspconfig": { "branch": "master", "commit": "dddd0945c0f31a0abd843425927a1712d2db2e10" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-treesitter": { "branch": "master", "commit": "ec8776ed9ef56ffe7a61e67b64d5d6b6aba2c631" }, + "nvim-treesitter": { "branch": "master", "commit": "6699eae8ba4551fe927da0f0f3f61ae085f836aa" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "oil.nvim": { "branch": "master", "commit": "a632c898fbe0e363ef89b9577f1a7714ab67d682" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, diff --git a/nvim/.config/nvim/lua/custom/plugins/init.lua b/nvim/.config/nvim/lua/custom/plugins/init.lua index 3491714..f88b6db 100644 --- a/nvim/.config/nvim/lua/custom/plugins/init.lua +++ b/nvim/.config/nvim/lua/custom/plugins/init.lua @@ -22,31 +22,31 @@ return { vim.keymap.set('n', 'a', function() harpoon:list():append() - end) + end, { desc = 'Append to harpoon' }) vim.keymap.set('n', '', function() harpoon.ui:toggle_quick_menu(harpoon:list()) - end) + end, { desc = 'Quick Menu' }) vim.keymap.set('n', '', function() harpoon:list():select(1) - end) + end, { desc = 'Select First' }) vim.keymap.set('n', '', function() harpoon:list():select(2) - end) + end, { desc = 'Select Second' }) vim.keymap.set('n', '', function() harpoon:list():select(3) - end) + end, { desc = 'Select Third' }) vim.keymap.set('n', '', function() harpoon:list():select(4) - end) + end, { desc = 'Select Fourth' }) -- Toggle previous & next buffers stored within Harpoon list vim.keymap.set('n', '', function() harpoon:list():prev() - end) + end, { desc = 'Select Previous' }) vim.keymap.set('n', '', function() harpoon:list():next() - end) + end, { desc = 'Select Next' }) end, }, { diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml index 7f0a7fe..275f15c 100644 --- a/starship/.config/starship.toml +++ b/starship/.config/starship.toml @@ -1,15 +1,16 @@ add_newline = false +# format = """ +# [==> ](red)$directory$git_branch$character +# """ format = """ -[==> ](red)$directory$git_branch$character +$directory$git_branch +; """ [directory] style = "#008080" -[git_branch] -format = "[git:(([\\($branch\\)](red)))](#6DACFA)" - [git_status] ahead = '⇡${count}' diverged = '⇕⇡${ahead_count}⇣${behind_count}'