diff --git a/ftplugin/javascript.lua b/ftplugin/javascript.lua new file mode 100644 index 0000000..94d00e9 --- /dev/null +++ b/ftplugin/javascript.lua @@ -0,0 +1,4 @@ +vim.opt_local.expandtab = true +vim.opt_local.shiftwidth = 4 +vim.opt_local.tabstop = 4 +vim.opt_local.softtabstop = 4 diff --git a/lazy-lock.json b/lazy-lock.json index 6220edf..8a70f6c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,20 +3,19 @@ "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, - "bufferline.nvim": { "branch": "main", "commit": "615aeb04ae73d827e2cc0c35fa5ba15f2b77f4bb" }, + "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "0c701cae3265c79b4fdfd4b35a4f3d7c5986d46c" }, - "codeium.vim": { "branch": "main", "commit": "9286586f790f837c4c3032f2124559936e77e6ed" }, + "codeium.vim": { "branch": "main", "commit": "5b8f68d5c0e32ae97d073a56ff14dba5646ec223" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, - "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "lsp-progress.nvim": { "branch": "main", "commit": "b673377c50ebaf37053f23cc3caeeb6d469ba1c1" }, "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, @@ -46,7 +45,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, - "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" }, + "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index cabf620..ab0b1c7 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -4,9 +4,9 @@ require("config.lazy") require("user.colorscheme") require("user.keymaps") -- require("user.snip") -require("core.neovide") -require("custom.autocmd") -require("custom.keymaps") +-- require("core.neovide") +-- require("custom.autocmd") +-- require("custom.keymaps") -- require("user.nvim-tree") -- require("user.options") -- require("user.keymaps") diff --git a/lua/custom/plugins/cmdline.lua b/lua/custom/plugins/cmdline.lua index d29a3e1..c89d491 100644 --- a/lua/custom/plugins/cmdline.lua +++ b/lua/custom/plugins/cmdline.lua @@ -7,7 +7,7 @@ if vim.g.neovide then end vim.opt.lazyredraw = is_neovide return { - { "gelguy/wilder.nvim", enabled = false }, + { "gelguy/wilder.nvim", enabled = not use_noice }, { "folke/noice.nvim", enabled = use_noice, diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 2157ab9..6b2a34e 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -37,6 +37,10 @@ return { require("mini.indentscope").setup(opts) end, }, + { + "hrsh7th/cmp-nvim-lua", + enabled = false, + }, -- { -- "gbprod/yanky.nvim", -- event = "InsertEnter", diff --git a/lua/custom/plugins/tokyonight.lua b/lua/custom/plugins/tokyonight.lua index 617d9f4..c772ad5 100644 --- a/lua/custom/plugins/tokyonight.lua +++ b/lua/custom/plugins/tokyonight.lua @@ -44,6 +44,7 @@ return { colors.bg_sidebar = colors.none colors.bg = colors.none colors.bg_dark = colors.none + colors.terminal_black = colors.none end, --- You can override specific highlights to use other groups or a hex color diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index 014d09a..bba95ae 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -52,7 +52,7 @@ keymap("v", "", '"+y', opts) keymap("x", "", '"+y', opts) keymap("n", "", '"+P', opts) keymap("v", "", '"+P', opts) -keymap("i", "", '"+P', opts) +keymap("i", "", "pa", opts) keymap("x", "", '"+P', opts) keymap("n", "", "undo", opts) keymap("x", "", "undo", opts)