diff --git a/init.lua b/init.lua index ede1977..4011323 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,5 @@ +vim.g.mapleader = "" + require("config.lazy") require("lazy").setup("plugins") @@ -5,7 +7,6 @@ local opt = vim.opt opt.number = true -vim.cmd("colorscheme unokai") opt.smartindent= true opt.clipboard='unnamedplus' @@ -22,7 +23,6 @@ opt.mouse = "n" opt.mousemodel = "popup" opt.mousescroll = {"ver:1", "hor:0"} -vim.g.mapleader = "" vim.lsp.config('lua_ls', { on_init = function(client) diff --git a/lazy-lock.json b/lazy-lock.json index 87dc7fe..5883392 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,8 +5,10 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "nerdtree": { "branch": "master", "commit": "690d061b591525890f1471c6675bcb5bdc8cdff9" }, "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-gdb": { "branch": "master", "commit": "b644f07c54608cc913c1d9e14954f15dcb7331a9" }, - "nvim-lspconfig": { "branch": "master", "commit": "2163c54bb6cfec53e3e555665ada945b8c8331b9" } + "nvim-lspconfig": { "branch": "master", "commit": "dd261ad5266ab5bbec249d21efeceda98ff3e1a6" }, + "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" } } diff --git a/lua/plugins.lua b/lua/plugins.lua index 2c0b4eb..2155433 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -81,6 +81,10 @@ function config_cmp() end +function theme() + vim.cmd('colorscheme tokyonight') +end + return { 'L3MON4D3/LuaSnip', 'saadparwaiz1/cmp_luasnip', @@ -93,5 +97,13 @@ return { 'hrsh7th/nvim-cmp', config = config_cmp }, - 'sakhnik/nvim-gdb' + 'sakhnik/nvim-gdb', + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + config = theme, + opts = {}, + }, + 'preservim/nerdtree' }