diff --git a/init.lua b/init.lua index 3fa4211..c6dd3cd 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,4 @@ +local opt = require 'utils.opt' local g = vim.g local cmd = vim.cmd @@ -24,5 +25,11 @@ require("plugins") require("options") require("bindings") -require("themes.gruvbox") +-- Background transparency +cmd [[autocmd ColorScheme * highlight Normal ctermbg=NONE guibg=NONE]] +cmd [[autocmd ColorScheme * highlight Folded ctermbg=NONE guibg=NONE]] + +-- Color scheme +opt('background', 'dark') +cmd [[colorscheme srcery]] diff --git a/lua/config/telescope.lua b/lua/config/telescope.lua index db8a3ff..df264a0 100644 --- a/lua/config/telescope.lua +++ b/lua/config/telescope.lua @@ -3,6 +3,7 @@ local map = require('utils.map') local actions = require('telescope.actions') local builtin = require('telescope.builtin') local previewers = require('telescope.previewers') +local cmd = vim.cmd local M = {} local function sizelimit_maker(filepath, bufnr, opts) @@ -44,9 +45,14 @@ map('n', 'ev', [[:lua require('config.telescope').edit_config()]], s -- Grep string map('n', 'fg', [[:lua require('telescope.builtin').live_grep()]], silent) +-- Change colorscheme +map('n', 'cs', [[:lua require('telescope.builtin').colorscheme()]], silent) + telescope.setup{ defaults = { buffer_previewer_maker = new_maker, + path_display = { "shorten" }, + color_devicons = true, mappings = { i = { [""] = actions.close @@ -62,6 +68,11 @@ telescope.setup{ }, live_grep = { theme = "dropdown", + disable_coordinates = true + }, + colorscheme = { + theme = "dropdown", + enable_preview = true } } } diff --git a/lua/plugins.lua b/lua/plugins.lua index f5f919a..b96ceea 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -54,13 +54,23 @@ local function usePlugins(use) use 'michaeljsmith/vim-indent-object' -- Color themes - use { 'morhetz/gruvbox', module = 'themes.gruvbox' } + use 'morhetz/gruvbox' + use 'tomasr/molokai' + use 'Mangeshrex/uwu.vim' + use 'ayu-theme/ayu-vim' + use 'sickill/vim-monokai' + use 'joshdick/onedark.vim' + use 'srcery-colors/srcery-vim' + use 'mswift42/vim-themes' + use 'squarefrog/tomorrow-night.vim' + use 'fnune/base16-vim' -- Git integration use { 'tpope/vim-fugitive', config = [[require 'config.fugitive']] } end -- Register custom commands for plugin manager +vim.cmd [[command! -bang -nargs=+ -complete=customlist,v:lua.require'plugins'.loader_complete PackerLoad lua require('plugins').loader(, '' == '!')]] vim.cmd [[command! PackerInstall packadd packer.nvim | lua require('plugins').install()]] vim.cmd [[command! PackerUpdate packadd packer.nvim | lua require('plugins').update()]] vim.cmd [[command! PackerSync packadd packer.nvim | lua require('plugins').sync()]] diff --git a/lua/themes/gruvbox.lua b/lua/themes/gruvbox.lua deleted file mode 100644 index e62e903..0000000 --- a/lua/themes/gruvbox.lua +++ /dev/null @@ -1,10 +0,0 @@ -local opt = require 'utils.opt' -local cmd = vim.cmd - -opt('background', 'dark') -cmd [[colorscheme gruvbox]] - --- Background transparency -cmd [[highlight Normal guibg=NONE ctermbg=NONE]] -cmd [[highlight Folded guibg=NONE ctermbg=NONE]] -