diff --git a/lua/main/init.lua b/lua/main/init.lua index be732c4..46834ec 100644 --- a/lua/main/init.lua +++ b/lua/main/init.lua @@ -1,6 +1,12 @@ -- load the colorscheme here vim.g.moonflyTransparent = true -vim.cmd([[colorscheme moonfly]]) +-- vim.cmd([[colorscheme moonfly]]) + +require("cyberdream").setup({ + theme = { + variant = "light", + }, +}) vim.opt["tabstop"] = 4 vim.opt["shiftwidth"] = 4 @@ -36,6 +42,3 @@ require("flutter-tools").setup({ open_cmd = "tabedit", }, }) - --- Use system clipboard -vim.opt.clipboard = "unnamedplus" diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 0950b35..85d754b 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -9,6 +9,8 @@ return { "hrsh7th/cmp-cmdline", "hrsh7th/cmp-nvim-lsp", { "antosha417/nvim-lsp-file-operations", config = true }, + "hrsh7th/vim-vsnip", + "hrsh7th/vim-vsnip-integ", }, config = function() -- https://github.com/folke/lazydev.nvim @@ -54,19 +56,87 @@ return { lspconfig.gopls.setup({}) lspconfig.lua_ls.setup({}) + -- Use system clipboard + vim.opt.clipboard = "unnamedplus" + + -- Set up nvim-cmp. local cmp = require("cmp") + cmp.setup({ + snippet = { + -- REQUIRED - you must specify a snippet engine + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. + -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users. + -- require('snippy').expand_snippet(args.body) -- For `snippy` users. + -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. + -- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+) + end, + }, + window = { + -- completion = cmp.config.window.bordered(), + -- documentation = cmp.config.window.bordered(), + }, mapping = cmp.mapping.preset.insert({ [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. }), sources = cmp.config.sources({ { name = "nvim_lsp" }, + { name = "vsnip" }, -- For vsnip users. + -- { name = 'luasnip' }, -- For luasnip users. + -- { name = 'ultisnips' }, -- For ultisnips users. + -- { name = 'snippy' }, -- For snippy users. + }, { { name = "buffer" }, }), }) + + -- To use git you need to install the plugin petertriho/cmp-git and uncomment lines below + -- Set configuration for specific filetype. + --[[ cmp.setup.filetype('gitcommit', { + sources = cmp.config.sources({ + { name = 'git' }, + }, { + { name = 'buffer' }, + }) + }) + require("cmp_git").setup() ]] + -- + + -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). + cmp.setup.cmdline({ "/", "?" }, { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + + -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { name = "cmdline" }, + }), + matching = { disallow_symbol_nonprefix_matching = false }, + }) + + -- Set up lspconfig. + local capabilities = require("cmp_nvim_lsp").default_capabilities() + -- Replace with each lsp server you've enabled. + require("lspconfig")["dartls"].setup({ + capabilities = capabilities, + }) + require("lspconfig")["gopls"].setup({ + capabilities = capabilities, + }) + require("lspconfig")["rust_analyzer"].setup({ + capabilities = capabilities, + }) end, } diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua index 8760561..8e7d84e 100644 --- a/lua/plugins/themes.lua +++ b/lua/plugins/themes.lua @@ -4,4 +4,24 @@ return { lazy = false, -- make sure we load this during startup if it is your main colorscheme priority = 1000, -- make sure to load this before all the other start plugins }, + { + "scottmckendry/cyberdream.nvim", + lazy = false, + priority = 1000, + }, + { + "f-person/auto-dark-mode.nvim", + opts = { + update_interval = 1000, + set_dark_mode = function() + vim.api.nvim_set_option_value("background", "dark", {}) + vim.cmd("colorscheme moonfly") + end, + set_light_mode = function() + vim.o.background = "light" + vim.api.nvim_set_option_value("background", "light", {}) + vim.cmd("colorscheme cyberdream") + end, + }, + }, }