diff --git a/.config/nvim/.lazy-lock.json b/.config/nvim/.lazy-lock.json index 12bc127..ba60658 100644 --- a/.config/nvim/.lazy-lock.json +++ b/.config/nvim/.lazy-lock.json @@ -1,43 +1,46 @@ { - "LuaSnip": { "branch": "master", "commit": "c4b9c7c3b02826df74b93ae91009e05b758bfacf" }, + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, "accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" }, - "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" }, - "autoclose.nvim": { "branch": "main", "commit": "37e11589aac55b0e8810dc5865f898f9cb36fef6" }, + "aerial.nvim": { "branch": "master", "commit": "75de06f8edbd0006997a19b760045753d4f6693c" }, + "autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, - "ccc.nvim": { "branch": "main", "commit": "c8cfd0a307c166d0defe6dde0c9f69cb9ea55a27" }, + "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "ccc.nvim": { "branch": "main", "commit": "d14e8e277ce65f3050caea2e486184e5429685d3" }, "cmp-look": { "branch": "master", "commit": "971e65a6be0e75c3438fe7b176d4fc020cb89d7b" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "compiler.nvim": { "branch": "main", "commit": "c1d92304fdf478342668b991739ffab46b219d7c" }, - "conform.nvim": { "branch": "master", "commit": "61cff430c9f15770d0c5e68c1b08067223bd94ab" }, - "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "git.nvim": { "branch": "main", "commit": "6b4a66f8a66e567bf27a0ef1de72cf5e338df4c3" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "image.nvim": { "branch": "master", "commit": "4c6cb5ad93ee93d8d7b7c84e1eb291cee99f0a0e" }, - "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" }, - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "neogit": { "branch": "master", "commit": "1c0369a39587054ff473179c1c04e793fb3d6378" }, - "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "compiler.nvim": { "branch": "main", "commit": "cb78e28b78fde5a9abd6f2fb8682aa61de09f6f4" }, + "conform.nvim": { "branch": "master", "commit": "63e0a32c85a39484813957dc480f171907aa90b9" }, + "copilot.vim": { "branch": "release", "commit": "1e135c5303bc60598f6314a2276f31dc91aa34dd" }, + "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" }, + "git.nvim": { "branch": "main", "commit": "cc116ae91efd307836d24b868916f50a94c6daf9" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "image.nvim": { "branch": "master", "commit": "645f997d171ea3d2505986a0519755600a26f02f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "lazy.nvim": { "branch": "main", "commit": "b0ba3f9399bf48c86abaa4db1a40bd0b681d5018" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "neogit": { "branch": "master", "commit": "be09dcbac8af93e03d8af24339c99b0b995d5acd" }, + "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-lspconfig": { "branch": "master", "commit": "c656fe5a58b9eae474f61d294648a897d53639cc" }, - "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, - "nvim-tree.lua": { "branch": "master", "commit": "863cf832ceb0b2377c913b7696dd7d64f4978941" }, - "nvim-treesitter": { "branch": "master", "commit": "d96bf9d522369eaf4ad57e607f134e51084ee1ad" }, - "nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" }, - "overseer.nvim": { "branch": "master", "commit": "792aeb6d834a11585ea5d667e3e3f05bc6aa4ecc" }, + "nvim-lspconfig": { "branch": "master", "commit": "710a8fa7379db32199545f30ea01dd8446b9302f" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" }, + "nvim-treesitter": { "branch": "master", "commit": "a80fe081b4c5890980561e0de2458f64aaffbfc7" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "nxwm": { "branch": "x11", "commit": "f63c1f7fec30d54a11a375cbacea251dee7ae80f" }, + "overseer.nvim": { "branch": "master", "commit": "9579e06f23e7d7777418939a4ffe8f3b2fffea7f" }, "oxocarbon.nvim": { "branch": "main", "commit": "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "swap-buffers.nvim": { "branch": "master", "commit": "eedf0b11abfb004f9e4fccd11aab5155c36c7eb3" }, - "telescope.nvim": { "branch": "master", "commit": "eb88dc6434194bd8eebfcc6ade5dd36e850849ce" }, + "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, "thethethe.nvim": { "branch": "main", "commit": "c32cf4290a03cedd67e41627ca3714b7f1a09d41" }, + "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, "translate.nvim": { "branch": "main", "commit": "30cc9e9f339b61e7bd40bc1ba7af73ea193bf589" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "trouble.nvim": { "branch": "main", "commit": "e2969409cf3f38f69913cc8fd9aa13137aabe760" }, + "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, + "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } } \ No newline at end of file diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index cdf90e4..453a1b4 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -13,8 +13,12 @@ LoadPreviousSessionOnLoad = true -- Load previous session or not EnableImageSupport = false -- Enable image support or not ImageBackend = 'kitty' -- Image backend to support (kitty/ueberzug) MaxAccelerationSpeed = 300 -- Max speed for j/k/gj/gk bindings. -Theme = 'oxocarbon' -- Theme to use +Theme = 'tokyonight-day' -- Theme to use +StatusTheme = 'tokyonight' -- Status theme to use DictFile = 'en_dict.txt' -- Dictionary to use for spell check +Font = ':' -- Font to use (GUI only) +CursorAnimationLength = 0 -- Cursor animation length (Neovide only) +ScrollAnimationLength = 0.1 -- Scroll animation length (Neovide only) Languages = { -- Languages to support - Used to configure highlighting 'html', -- For HTML 'css', -- For CSS @@ -36,6 +40,7 @@ LanguageServers = { -- Language servers to use for LSP, run LspInstall to } Themes = { { 'nyoom-engineering/oxocarbon.nvim' }, -- Oxocarbon + { 'folke/tokyonight.nvim' }, -- Tokyo Night --[[ { 'rmehri01/onenord.nvim', branch = 'main' }, -- One Nord theme { 'romgrk/doom-one.vim' }, -- Doom-One theme @@ -107,6 +112,10 @@ Plugins = { -- Plugins to use { 'stevearc/aerial.nvim' }, -- Object viewer { 'caenrique/swap-buffers.nvim' }, -- Swap buffers { 'LunarVim/bigfile.nvim' }, -- Disable heavy features if the file is big + { 'github/copilot.vim' }, -- Copilot + { 'altermo/nxwm', + branch = 'x11', + }, -- GUI display } opt.title = true -- Display title @@ -190,7 +199,7 @@ keymap('n', 'ZX', 'q!', keymap('n', 'Zz', 'w!', defaultKeybindOptions) -- Save keymap('n', '', 'v/{%', defaultKeybindOptions) -- Select an entire function keymap('n', '', 'NvimTreeToggle', defaultKeybindOptions) -- Toggle NvimTree -keymap('n', '.', 'TroubleToggle', defaultKeybindOptions) -- Toggle Trouble +keymap('n', '.', 'Trouble toggle diagnostics', defaultKeybindOptions) -- Toggle Trouble keymap('n', ',', 'AerialToggle', defaultKeybindOptions) -- Toggle Aerial keymap('n', 'G', 'Neogit', defaultKeybindOptions) -- Toggle Neogit keymap('n', 'gt', 'Gitsigns toggle_current_line_blame', defaultKeybindOptions) -- Toggle current line blame diff --git a/.config/nvim/lua/bootstrap.lua b/.config/nvim/lua/bootstrap.lua index 0108fb3..892369d 100644 --- a/.config/nvim/lua/bootstrap.lua +++ b/.config/nvim/lua/bootstrap.lua @@ -29,3 +29,7 @@ local lazyOptions = { require('lazy').setup(combineTable(combineTable(Plugins, Themes), lazyOptions)) require('setup') + +vim.g.neovide_cursor_animation_length = CursorAnimationLength +vim.g.neovide_scroll_animation_length = ScrollAnimationLength +vim.o.guifont = Font diff --git a/.config/nvim/lua/lsp_config.lua b/.config/nvim/lua/lsp_config.lua index e68d01f..6cc2b40 100644 --- a/.config/nvim/lua/lsp_config.lua +++ b/.config/nvim/lua/lsp_config.lua @@ -80,7 +80,7 @@ local lua_ls = function() } } }) -end, +end require('mason').setup({}) @@ -97,6 +97,9 @@ cmp.setup({ { name = 'nvim_lsp', }, + { + name = 'copilot', + }, { name = 'look', keyword_length = 2, diff --git a/.config/nvim/lua/lualine_config.lua b/.config/nvim/lua/lualine_config.lua index 1c72562..bb8b8cc 100644 --- a/.config/nvim/lua/lualine_config.lua +++ b/.config/nvim/lua/lualine_config.lua @@ -43,7 +43,7 @@ local config = { -- Disable sections and component separators component_separators = '', section_separators = '', - theme = Theme, + theme = StatusTheme, }, sections = { -- these are to remove the defaults diff --git a/.config/nvim/lua/noice_config.lua b/.config/nvim/lua/noice_config.lua index f0660c0..da1b131 100644 --- a/.config/nvim/lua/noice_config.lua +++ b/.config/nvim/lua/noice_config.lua @@ -3,4 +3,11 @@ -- https://git.speedie.site/speedie/speedie-nvim -- ]]-- -require('noice').setup({}) +require('noice').setup({ + routes = { + { + filter = { event = "notify", find = "warning: multiple different client offset_encodings" }, + opts = { skip = true }, + }, + }, +}) diff --git a/.config/nvim/lua/setup.lua b/.config/nvim/lua/setup.lua index 086f2d4..4fa34c1 100644 --- a/.config/nvim/lua/setup.lua +++ b/.config/nvim/lua/setup.lua @@ -8,6 +8,7 @@ If you want plugins to have special settings, you should modify those Lua files. --]] +require('theme_config') require('conform_config') require('autoclose_config') require('lsp_config') @@ -17,7 +18,6 @@ require('tree_config') require('telescope_config') require('image_config') require('ts_config') -require('theme_config') require('trouble_config') require('translate_config') require('accelerated_config') diff --git a/.config/nvim/lua/theme_config.lua b/.config/nvim/lua/theme_config.lua index a7a9c73..0c91e24 100644 --- a/.config/nvim/lua/theme_config.lua +++ b/.config/nvim/lua/theme_config.lua @@ -3,4 +3,4 @@ -- https://git.speedie.site/speedie/speedie-nvim -- ]]-- -vim.cmd('colorscheme ' .. Theme .. '') +vim.cmd.colorscheme(Theme)