From 0a115741a650d5b17cf4904a7e4f225ed758afa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 17 Aug 2023 11:07:02 +0200 Subject: [PATCH] Update plugings --- .../material/lua/lush_theme/material.lua | 75 +++++++++++++++++++ nvim/lazy-lock.json | 35 ++++----- nvim/lua/lsp_config.lua | 9 ++- nvim/lua/mappings.lua | 1 + nvim/lua/plugins.lua | 6 +- 5 files changed, 105 insertions(+), 21 deletions(-) diff --git a/nvim/colorschemes/material/lua/lush_theme/material.lua b/nvim/colorschemes/material/lua/lush_theme/material.lua index 81de2a9..9f0d399 100644 --- a/nvim/colorschemes/material/lua/lush_theme/material.lua +++ b/nvim/colorschemes/material/lua/lush_theme/material.lua @@ -540,6 +540,81 @@ local theme = lush(function(injected_functions) sym"@punctuation.delimiter" { Normal }, sym"@puncuation.bracket" { Normal }, -- For brackets and parens. sym"@puncuation.special" { Normal }, -- For special punctutation that does not fall in the catagories before. + NeogitCommandCodeError { Error }, -- NeogitCommandCodeError xxx links to Error + NeogitPopupBranchName { String }, -- NeogitPopupBranchName xxx links to String + NeogitCommandCodeNormal { String }, -- NeogitCommandCodeNormal xxx links to String + NeogitPopupSectionTitle { Function }, -- NeogitPopupSectionTitle xxx links to Function + NeogitNotificationError { DiagnosticError }, -- NeogitNotificationError xxx links to DiagnosticError + NeogitNotificationWarning { DiagnosticWarn }, -- NeogitNotificationWarning xxx links to DiagnosticWarn + NeogitNotificationInfo { DiagnosticInfo }, -- NeogitNotificationInfo xxx links to DiagnosticInfo + NeogitPopupSwitchDisabled { Comment }, -- NeogitPopupSwitchDisabled xxx links to Comment + NeogitPopupOptionDisabled { Comment }, -- NeogitPopupOptionDisabled xxx links to Comment + NeogitPopupConfigDisabled { Comment }, -- NeogitPopupConfigDisabled xxx links to Comment + NeogitStash { Comment }, -- NeogitStash xxx links to Comment + NeogitObjectId { Comment }, -- NeogitObjectId xxx links to Comment + NeogitCommandTime { Comment }, -- NeogitCommandTime xxx links to Comment + NeogitCommandText { Comment }, -- NeogitCommandText xxx links to Comment + NeogitPopupActionDisabled { Comment }, -- NeogitPopupActionDisabled xxx links to Comment + NeogitRebaseDone { Comment }, -- NeogitRebaseDone xxx links to Comment + NeogitSectionHeader { fg="#719c96", gui="bold", }, -- NeogitSectionHeader xxx cterm=bold gui=bold guifg=#719c96 + NeogitReverting { NeogitSectionHeader }, -- NeogitReverting xxx links to NeogitSectionHeader + NeogitPicking { NeogitSectionHeader }, -- NeogitPicking xxx links to NeogitSectionHeader + NeogitRebasing { NeogitSectionHeader }, -- NeogitRebasing xxx links to NeogitSectionHeader + NeogitStashes { NeogitSectionHeader }, -- NeogitStashes xxx links to NeogitSectionHeader + NeogitStagedchanges { NeogitSectionHeader }, -- NeogitStagedchanges xxx links to NeogitSectionHeader + NeogitRecentcommits { NeogitSectionHeader }, -- NeogitRecentcommits xxx links to NeogitSectionHeader + NeogitUnpulledchanges { NeogitSectionHeader }, -- NeogitUnpulledchanges xxx links to NeogitSectionHeader + NeogitUnmergedchanges { NeogitSectionHeader }, -- NeogitUnmergedchanges xxx links to NeogitSectionHeader + NeogitUntrackedfiles { NeogitSectionHeader }, -- NeogitUntrackedfiles xxx links to NeogitSectionHeader + NeogitUnstagedchanges { NeogitSectionHeader }, -- NeogitUnstagedchanges xxx links to NeogitSectionHeader + NeogitDiffContext { bg="#26292e", }, -- NeogitDiffContext xxx cterm= gui= guibg=#26292e + NeogitChangeNewFile { fg="#4d9970", gui="bold,italic", }, -- NeogitChangeNewFile xxx cterm=bold,italic gui=bold,italic guifg=#4d9970 + NeogitChangeBothModified { fg="#739e98", gui="bold,italic", }, -- NeogitChangeBothModified xxx cterm=bold,italic gui=bold,italic guifg=#739e98 + NeogitChangeCopied { fg="#a75454", gui="bold,italic", }, -- NeogitChangeCopied xxx cterm=bold,italic gui=bold,italic guifg=#a75454 + NeogitChangeUpdated { fg="#a95555", gui="bold,italic", }, -- NeogitChangeUpdated xxx cterm=bold,italic gui=bold,italic guifg=#a95555 + NeogitChangeRenamed { fg="#719c96", gui="bold,italic", }, -- NeogitChangeRenamed xxx cterm=bold,italic gui=bold,italic guifg=#719c96 + NeogitChangeDeleted { fg="#a75454", gui="bold,italic", }, -- NeogitChangeDeleted xxx cterm=bold,italic gui=bold,italic guifg=#a75454 + NeogitChangeAdded { fg="#4d9970", gui="bold,italic", }, -- NeogitChangeAdded xxx cterm=bold,italic gui=bold,italic guifg=#4d9970 + NeogitChangeModified { fg="#719c96", gui="bold,italic", }, -- NeogitChangeModified xxx cterm=bold,italic gui=bold,italic guifg=#719c96 + NeogitFold { }, -- NeogitFold xxx cterm= gui= + NeogitUnpulledFrom { fg="#719c96", gui="bold", }, -- NeogitUnpulledFrom xxx cterm=bold gui=bold guifg=#719c96 + NeogitUnpushedTo { fg="#719c96", gui="bold", }, -- NeogitUnpushedTo xxx cterm=bold gui=bold guifg=#719c96 + NeogitUnmergedInto { fg="#719c96", gui="bold", }, -- NeogitUnmergedInto xxx cterm=bold gui=bold guifg=#719c96 + NeogitRemote { fg="#5eba88", gui="bold", }, -- NeogitRemote xxx cterm=bold gui=bold guifg=#5eba88 + NeogitBranch { fg="#cc6666", gui="bold", }, -- NeogitBranch xxx cterm=bold gui=bold guifg=#cc6666 + NeogitDiffHeaderHighlight { bg="#3a3d41", fg="#cc6666", gui="bold", }, -- NeogitDiffHeaderHighlight xxx cterm=bold gui=bold guifg=#cc6666 guibg=#3a3d41 + NeogitFilePath { fg="#8abeb7", gui="italic", }, -- NeogitFilePath xxx cterm=italic gui=italic guifg=#8abeb7 + NeogitGraphBoldGray { fg="#7a7c7f", gui="bold", }, -- NeogitGraphBoldGray xxx cterm=bold gui=bold guifg=#7a7c7f + NeogitGraphBoldPurple { fg="#8abeb7", gui="bold", }, -- NeogitGraphBoldPurple xxx cterm=bold gui=bold guifg=#8abeb7 + NeogitGraphBoldBlue { fg="#8abeb7", gui="bold", }, -- NeogitGraphBoldBlue xxx cterm=bold gui=bold guifg=#8abeb7 + NeogitGraphBoldCyan { fg="#cc6666", gui="bold", }, -- NeogitGraphBoldCyan xxx cterm=bold gui=bold guifg=#cc6666 + NeogitGraphBoldGreen { fg="#5eba88", gui="bold", }, -- NeogitGraphBoldGreen xxx cterm=bold gui=bold guifg=#5eba88 + NeogitGraphBoldYellow { fg="#8abeb7", gui="bold", }, -- NeogitGraphBoldYellow xxx cterm=bold gui=bold guifg=#8abeb7 + NeogitGraphBoldWhite { gui="bold", }, -- NeogitGraphBoldWhite xxx cterm=bold gui=bold + NeogitGraphBoldRed { fg="#cc6666", gui="bold", }, -- NeogitGraphBoldRed xxx cterm=bold gui=bold guifg=#cc6666 + NeogitGraphGray { fg="#7a7c7f", }, -- NeogitGraphGray xxx cterm= gui= guifg=#7a7c7f + NeogitGraphPurple { fg="#8abeb7", }, -- NeogitGraphPurple xxx cterm= gui= guifg=#8abeb7 + NeogitGraphBlue { fg="#8abeb7", }, -- NeogitGraphBlue xxx cterm= gui= guifg=#8abeb7 + NeogitGraphCyan { fg="#cc6666", }, -- NeogitGraphCyan xxx cterm= gui= guifg=#cc6666 + NeogitGraphGreen { fg="#5eba88", }, -- NeogitGraphGreen xxx cterm= gui= guifg=#5eba88 + NeogitGraphYellow { fg="#8abeb7", }, -- NeogitGraphYellow xxx cterm= gui= guifg=#8abeb7 + NeogitGraphWhite { }, -- NeogitGraphWhite xxx cterm= gui= + NeogitGraphRed { fg="#cc6666", }, -- NeogitGraphRed xxx cterm= gui= guifg=#cc6666 + NeogitCursorLine { bg="#26292e", }, -- NeogitCursorLine xxx cterm= gui= guibg=#26292e + NeogitHunkHeaderHighlight { bg="#9fcac4", fg="#22252a", gui="bold", }, -- NeogitHunkHeaderHighlight xxx cterm=bold gui=bold guifg=#22252a guibg=#9fcac4 + NeogitDiffDeleteHighlight { bg="#cc6666", fg="#c5c8c6" }, -- NeogitDiffDeleteHighlight xxx cterm= gui= guifg=#cc6666 guibg=#cc6666 + NeogitDiffContextHighlight { bg="#303338", }, -- NeogitDiffContextHighlight xxx cterm= gui= guibg=#303338 + NeogitDiffAddHighlight { bg="#5f875f", fg="#c5c8c6", }, -- NeogitDiffAddHighlight xxx cterm= gui= guifg=#5eba88 guibg=#5f875f + NeogitCommitViewHeader { bg="#a75454", fg="#22252a", }, -- NeogitCommitViewHeader xxx cterm= gui= guifg=#22252a guibg=#a75454 + NeogitPopupBold { gui="bold", }, -- NeogitPopupBold xxx cterm=bold gui=bold + NeogitPopupActionKey { fg="#8abeb7", }, -- NeogitPopupActionKey xxx cterm= gui= guifg=#8abeb7 + NeogitHunkHeader { bg="#7a7c7f", fg="#22252a", gui="bold", }, -- NeogitHunkHeader xxx cterm=bold gui=bold guifg=#22252a guibg=#7a7c7f + NeogitPopupConfigKey { fg="#8abeb7", }, -- NeogitPopupConfigKey xxx cterm= gui= guifg=#8abeb7 + NeogitDiffAdd { bg="#5f875f", fg="#c5c8c6", }, -- NeogitDiffAdd xxx cterm= gui= guifg=#4d9970 guibg=#5f875f + NeogitDiffDelete { NeogitDiffDeleteHighlight }, -- NeogitDiffDelete xxx cterm= gui= guifg=#a75454 guibg=#cc6666 + NeogitPopupOptionKey { fg="#8abeb7", fg="#c5c8c6",}, -- NeogitPopupOptionKey xxx cterm= gui= guifg=#8abeb7 + NeogitDiffHeader { bg="#3a3d41", fg="#8abeb7", gui="bold", }, -- NeogitDiffHeader xxx cterm=bold gui=bold guifg=#8abeb7 guibg=#3a3d41 + NeogitPopupSwitchKey { fg="#8abeb7", }, -- NeogitPopupSwitchKey xxx cterm= gui= guifg=#8abeb7 } end) return theme diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index be610c8..3f0a9ba 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,37 +1,38 @@ { - "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" }, + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "awesomewm-vim-tmux-navigator": { "branch": "master", "commit": "e448723a099a4a702830ffa73791bf5e99b5ef69" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "diffview.nvim": { "branch": "main", "commit": "db97e667e03294bfa9f15e544e78f3082247bf79" }, "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, - "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" }, - "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, - "leap.nvim": { "branch": "main", "commit": "7eeeb3ff74ff8cabd583a061492e76c1c6d2bac8" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "lush.nvim": { "branch": "main", "commit": "b10ef2bfff0647e701b691019ade3edd5e44eb50" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" }, - "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, - "neogit": { "branch": "master", "commit": "3d63d76f04dc7102c83a057ded30a93822b59dec" }, + "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, + "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "lush.nvim": { "branch": "main", "commit": "a8f0f7b9f837887f13a61d67b40ae26188fe4d62" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, + "mason.nvim": { "branch": "main", "commit": "74eac861b013786bf231b204b4ba9a7d380f4bd9" }, + "neogit": { "branch": "master", "commit": "dd3618d4b64cfc1777c1f7c2249cf917b3502b36" }, "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, - "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, - "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" }, + "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, + "nvim-lspconfig": { "branch": "master", "commit": "0d29cad8de3b2c654315203fc1fe12fde722a18a" }, "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" }, - "nvim-treesitter": { "branch": "master", "commit": "9fa6806b88905d52b5ca36094909630919b432cc" }, - "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, + "nvim-treesitter": { "branch": "master", "commit": "f7bb866405530e863135596900781e73cbf6f4ed" }, + "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "supertab": { "branch": "master", "commit": "f0093ae12a9115498f887199809a6114659fc858" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, + "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, "trim.nvim": { "branch": "master", "commit": "2df124c2c2844d3143091ebd3ae8b49bbe06bc5e" }, - "trouble.nvim": { "branch": "main", "commit": "20d1b30d6925213abece21d35858a16e11d1e9fc" }, + "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, "vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" }, "vim-python-pep8-indent": { "branch": "master", "commit": "60ba5e11a61618c0344e2db190210145083c91f8" }, "vim-rooter": { "branch": "master", "commit": "4f52ca556a0b9e257bf920658714470ea0320b7a" }, "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" }, "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" }, - "vimtex": { "branch": "master", "commit": "5e50cc0e96e8a8ffc6fd10d627d65b8d1354b5da" }, - "vimwiki": { "branch": "dev", "commit": "09804c2a5f1009fde29e32c5f3a6093e4684433a" } + "vimtex": { "branch": "master", "commit": "c58590009be0eff0c234527bb48fa1653afe41bd" }, + "vimwiki": { "branch": "dev", "commit": "f0fe154ede6b11e3db9b058b930005a056a3d1c6" } } \ No newline at end of file diff --git a/nvim/lua/lsp_config.lua b/nvim/lua/lsp_config.lua index 9b7a445..896c75e 100644 --- a/nvim/lua/lsp_config.lua +++ b/nvim/lua/lsp_config.lua @@ -183,7 +183,14 @@ require('lspconfig').jdtls.setup { } require('lspconfig').rust_analyzer.setup { - capabilities = capabilities + capabilities = capabilities, + settings = { + ['rust-analyzer'] = { + diagnostics = { + enable = false; + } + } + } } require('lspconfig').lua_ls.setup { diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index e953a79..e45cf32 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -5,6 +5,7 @@ vim.api.nvim_set_keymap("n", "", "", {}) vim.api.nvim_set_keymap("v", "", "\"+y", { noremap = true }) -- vim.api.nvim_set_keymap("n", "", "\"+p", { noremap = true }) -- vim.api.nvim_set_keymap("v", "", "\"+p", { noremap = true }) +vim.api.nvim_set_keymap("t", "jj", "", { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "", "", { noremap = true }) vim.api.nvim_set_keymap("n", "", "", { noremap = true }) vim.api.nvim_set_keymap("n", "", "", { noremap = true }) diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 821efb0..fbf0b64 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -22,15 +22,15 @@ require('lazy').setup({ 'ggandor/leap.nvim', 'gpanders/editorconfig.nvim', 'intrntbrn/awesomewm-vim-tmux-navigator', - 'lervag/vimtex', 'mbbill/undotree', 'numToStr/Comment.nvim', - 'vimwiki/vimwiki', + {'vimwiki/vimwiki'}, 'windwp/nvim-autopairs', + {'lervag/vimtex', ft='latex'}, {'williamboman/mason-lspconfig.nvim', dependencies = {'williamboman/mason.nvim', 'neovim/nvim-lspconfig'}}, {"folke/trouble.nvim", dependencies = {"nvim-tree/nvim-web-devicons"}}, {"nvim-treesitter/nvim-treesitter", build = ":TSUpdate"}, - {'TimUntersberger/neogit', dependencies = {'nvim-lua/plenary.nvim'} }, + {"NeogitOrg/neogit", dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true}, {'hrsh7th/nvim-cmp', dependencies = {'hrsh7th/cmp-buffer', 'hrsh7th/cmp-cmdline', 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path', 'hrsh7th/vim-vsnip', 'hrsh7th/vim-vsnip-integ'}}, {'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons', opt = true }}, {'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' },