diff --git a/.gitignore b/.gitignore index 1fcb75b..b436d12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ doom/config.el +nvim/plugin/packer_compiled.lua diff --git a/nvim/lua/maps.lua b/nvim/lua/maps.lua index fd19b29..d610575 100644 --- a/nvim/lua/maps.lua +++ b/nvim/lua/maps.lua @@ -10,8 +10,7 @@ end -- some unmaps unmap(' ') unmap('q') -map('', '', '') -map('!', '', '') +unmap('') -- option control map('n', 'c', ':setlocal cursorline!') diff --git a/nvim/lua/packer_init.lua b/nvim/lua/packer_init.lua new file mode 100644 index 0000000..2824870 --- /dev/null +++ b/nvim/lua/packer_init.lua @@ -0,0 +1,17 @@ +local ensure_packer = function() + local install_path = vim.fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' + if vim.fn.empty(vim.fn.glob(install_path)) > 0 then + vim.fn.system {'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path} + vim.cmd [[packadd packer.nvim]] + return true + end + return false +end + +local packer_bootstrap = ensure_packer() +require('packer').startup(plugins) +if packer_bootstrap then + require('packer').sync() + return true +end +return false diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 89bdefe..38813d8 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -1,40 +1,44 @@ -local ensure_packer = function() - local install_path = vim.fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' - if vim.fn.empty(vim.fn.glob(install_path)) > 0 then - vim.fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - vim.cmd [[packadd packer.nvim]] - return true - end - return false -end - -local packer_bootstrap = ensure_packer() - -require('packer').startup(function(use) +-- [[ plugins list ]] +plugins = function(use) use 'wbthomason/packer.nvim' - use 'lifepillar/vim-gruvbox8' + use 'lifepillar/vim-gruvbox8' + use 'hoob3rt/lualine.nvim' use 'mhinz/vim-signify' use 'tpope/vim-fugitive' use 'tpope/vim-rsi' use 'tpope/vim-vinegar' - use 'hoob3rt/lualine.nvim' + use 'nvim-lua/plenary.nvim' + use 'nvim-telescope/telescope.nvim' use { 'w0rp/ale', ft = { 'sh', 'zsh', 'lua', 'python' }, cmd = 'ALEEnable' } -end) - -if packer_bootstrap then - require('packer').sync() - return end -require('lualine').setup { options = { icons_enabled = false } } +--[[ init packer if missing ]] +if require('packer_init') then return end + +--[[ plugins config ]] +require('lualine').setup { + options = { + icons_enabled = false, + section_separators = { left = nil, right = nil }, + component_separators = { left = '|', right = '|' } + } +} + +--[[ telescope maps ]] +map('n', 'ff', 'Telescope find_files') +map('n', 'fb', 'Telescope buffers') + +--[[ theme ]] vim.o.bg = 'dark' vim.o.termguicolors = true + vim.g.gruvbox_transp_bg = 1 vim.g.gruvbox_plugin_hi_groups = 1 vim.g.gruvbox_filetype_hi_groups = 1 -vim.cmd('colorscheme gruvbox8') + +vim.cmd [[colorscheme gruvbox8]]