diff --git a/lazy-lock.json b/lazy-lock.json index b920146..207f9e4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -36,7 +36,7 @@ "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, - "nvim-lspconfig": { "branch": "master", "commit": "443c56a0cc67aad932c49d0b4a814d3014a3732f" }, + "nvim-lspconfig": { "branch": "master", "commit": "6c53bf7fb02a2de7e7c84be7a2bd7a502f66a802" }, "nvim-navic": { "branch": "master", "commit": "e6da6f74d89de65258ea7e98e22103ff5de6dcf5" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-spectre": { "branch": "master", "commit": "1ef252c1bf569b88e7e2fafde1eb0861d4f06aa3" }, @@ -44,7 +44,8 @@ "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, - "orgmode": { "branch": "master", "commit": "6f73b461b9f887968d0f69ab3aee6b4ceebe3445" }, + "orgmode": { "branch": "master", "commit": "b5e12db00e88a9183fd19d9868698d85aec96aca" }, + "oxocarbon.nvim": { "branch": "main", "commit": "12a7507f1cd5ac6edb890d12268e4444a35956f2" }, "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "rasmus.nvim": { "branch": "main", "commit": "f824de95d446686e479781c0c2b778c177da528f" }, @@ -58,5 +59,6 @@ "vim-fugitive": { "branch": "master", "commit": "b3b838d690f315a503ec4af8c634bdff3b200aaf" }, "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, + "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" }, "which-key.nvim": { "branch": "main", "commit": "38b990f6eabf62014018b4aae70a97d7a6c2eb88" } } \ No newline at end of file diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 891b190..86d862f 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -26,7 +26,7 @@ require("lazy").setup({ version = false, -- always use the latest git commit -- version = "*", -- try installing the latest stable version for plugins that support semver }, - install = { colorscheme = { "tokyonight", "habamax" } }, + install = { colorscheme = { "oxocarbon", "tokyonight", "habamax" } }, checker = { enabled = true }, -- automatically check for plugin updates performance = { rtp = { diff --git a/lua/plugins/colors.lua b/lua/plugins/colors.lua index 428e2a7..96ab2bf 100644 --- a/lua/plugins/colors.lua +++ b/lua/plugins/colors.lua @@ -4,6 +4,7 @@ return { { "kvrohit/rasmus.nvim" }, { "ntk148v/komau.vim" }, { "ray-x/aurora" }, + { "nyoom-engineering/oxocarbon.nvim" }, { "folke/styler.nvim", config = function() @@ -12,6 +13,7 @@ return { markdown = { colorscheme = "rasmus" }, help = { colorscheme = "catppuccin-mocha", background = "dark" }, elixir = { colorscheme = "kanagawa" }, + lua = { colorscheme = "catppuccin-mocha" }, }, }) end, diff --git a/lua/plugins/tmux.lua b/lua/plugins/tmux.lua index 24f1668..20bf721 100644 --- a/lua/plugins/tmux.lua +++ b/lua/plugins/tmux.lua @@ -1,6 +1,17 @@ return { - "aserowy/tmux.nvim", - config = function() - return require("tmux").setup({}) - end, + { + "aserowy/tmux.nvim", + config = function() + return require("tmux").setup({}) + end, + }, + { + "christoomey/vim-tmux-navigator", + keys = { + [" TmuxNavigatorLeft", "Window Left" }, + [" TmuxNavigatorRight", "Window Right" }, + [" TmuxNavigatorDown", "Window Down" }, + [" TmuxNavigatorUp", "Window Up" }, + }, + }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 2f6b377..4216843 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -26,6 +26,7 @@ return { indent = { enable = true }, ensure_installed = { "bash", + "bicep", "c", "clojure", "comment", @@ -44,7 +45,6 @@ return { "kotlin", "latex", "ledger", - "ledger", "lua", "luadoc", "luap", @@ -62,7 +62,6 @@ return { "ruby", "rust", "scala", - "scala", "scheme", "sql", "tsx", @@ -70,7 +69,6 @@ return { "vim", "vimdoc", "yaml", - "yaml", "zig", }, incremental_selection = {