modify gitignore, keybinds shade config
This commit is contained in:
juan
parent
6d31cfec51
commit
892f76f591
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
*.sh
|
||||
./plugin/
|
||||
plugin/*
|
||||
|
||||
@ -3,6 +3,7 @@ local opt = vim.o
|
||||
local global = vim.g
|
||||
|
||||
-- look and feel
|
||||
vim.opt.shortmess:append({ I = true }) -- remove intro message
|
||||
opt.relativenumber = true
|
||||
opt.number = true
|
||||
opt.showmode = false
|
||||
@ -19,8 +20,10 @@ opt.smartindent = true
|
||||
opt.mouse = "i"
|
||||
|
||||
-- completion for lua
|
||||
opt.completeopt = 'menuone,noselect'
|
||||
opt.completeopt = 'noinsert'
|
||||
|
||||
-- neoformat settings.
|
||||
global.neoformat_basic_format_align = 1
|
||||
global.neoformat_basic_format_trim = 1
|
||||
-- leader settings
|
||||
global.mapleader = ' '
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
-- generic mappings
|
||||
|
||||
vim.api.nvim_set_keymap('v', '<', '<gv', {noremap = true})
|
||||
vim.api.nvim_set_keymap('v', '>', '>gv', {noremap = true})
|
||||
vim.api.nvim_set_keymap('n', 'Y', 'y$', {noremap = true})
|
||||
@ -21,3 +20,20 @@ vim.api.nvim_set_keymap('i', ',', ',<c-g>u', {noremap = true})
|
||||
vim.api.nvim_set_keymap('i', '.', '.<c-g>u', {noremap = true})
|
||||
vim.api.nvim_set_keymap('i', '!', '!<c-g>u', {noremap = true})
|
||||
vim.api.nvim_set_keymap('i', '?', '?<c-g>u', {noremap = true})
|
||||
|
||||
-- plugin mappings
|
||||
-- toggle NvimTree
|
||||
vim.api.nvim_set_keymap('', '<C-n>', ':NvimTreeToggle<cr>', {})
|
||||
-- toggle formatter
|
||||
vim.api.nvim_set_keymap('', '<leader>fm', ':Neoformat<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>/', ':CommentToggle<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>r', ':SnipRun<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>b', ':HopWordBC<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>w', ':HopWordAC<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>k', ':HopLineStartBC<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>j', ':HopLineStartAC<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>tf', ':Telescope fd<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>tdd',
|
||||
':Telescope lsp_document_diagnostics<cr>', {})
|
||||
vim.api.nvim_set_keymap('', '<leader>tdw',
|
||||
':Telescope lsp_workspace_diagnostics<cr>', {})
|
||||
|
||||
@ -2,147 +2,153 @@
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
|
||||
require('packer').init {
|
||||
display = {
|
||||
open_fn = function()
|
||||
return require("packer.util").float {border = "single"}
|
||||
end,
|
||||
prompt_border = "single"
|
||||
},
|
||||
git = {
|
||||
clone_timeout = 600 -- Timeout, in seconds, for git clones
|
||||
},
|
||||
auto_clean = true,
|
||||
compile_on_sync = true
|
||||
-- auto_reload_compiled = true
|
||||
display = {
|
||||
open_fn = function()
|
||||
return require("packer.util").float {border = "single"}
|
||||
end,
|
||||
prompt_border = "single"
|
||||
},
|
||||
git = {
|
||||
clone_timeout = 600 -- Timeout, in seconds, for git clones
|
||||
},
|
||||
auto_clean = true,
|
||||
compile_on_sync = true
|
||||
-- auto_reload_compiled = true
|
||||
}
|
||||
|
||||
return require('packer').startup(function(use)
|
||||
use {'wbthomason/packer.nvim', event = 'VimEnter'}
|
||||
use {'wbthomason/packer.nvim', event = 'VimEnter'}
|
||||
|
||||
-- core UI
|
||||
use {'kyazdani42/nvim-web-devicons', after = 'packer.nvim'}
|
||||
use {
|
||||
'hoob3rt/lualine.nvim',
|
||||
after = 'nvim-web-devicons',
|
||||
config = function() require "plugins.statusline" end
|
||||
}
|
||||
use {
|
||||
'RRethy/nvim-base16',
|
||||
event = 'VimEnter',
|
||||
config = function() require "plugins.base16" end
|
||||
}
|
||||
-- core UI
|
||||
use {'kyazdani42/nvim-web-devicons', after = 'packer.nvim'}
|
||||
use {
|
||||
'hoob3rt/lualine.nvim',
|
||||
after = 'nvim-web-devicons',
|
||||
config = function() require "plugins.statusline" end
|
||||
}
|
||||
use {
|
||||
'RRethy/nvim-base16',
|
||||
after = 'packer.nvim',
|
||||
config = function() require "plugins.base16" end
|
||||
}
|
||||
|
||||
-- lsp stuff
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
event = 'VimEnter',
|
||||
config = function() require "plugins.treesitter" end,
|
||||
run = ':TSUpdate'
|
||||
}
|
||||
use {
|
||||
'lewis6991/spellsitter.nvim',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require('spellsitter').setup() end
|
||||
}
|
||||
use {'neovim/nvim-lspconfig', after = "coq_nvim"}
|
||||
use {
|
||||
'kabouzeid/nvim-lspinstall',
|
||||
config = function() require "plugins.lspinstall" end,
|
||||
after = 'nvim-lspconfig'
|
||||
}
|
||||
use {
|
||||
'ms-jpq/coq_nvim',
|
||||
branch = 'coq',
|
||||
event = 'BufEnter',
|
||||
config = function() require "plugins.coq" end
|
||||
}
|
||||
use {'ms-jpq/coq.artifacts', after = 'coq_nvim', branch = 'artifacts'}
|
||||
-- lsp stuff
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
event = 'VimEnter',
|
||||
config = function() require "plugins.treesitter" end,
|
||||
run = ':TSUpdate'
|
||||
}
|
||||
use {
|
||||
'lewis6991/spellsitter.nvim',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require('spellsitter').setup() end
|
||||
}
|
||||
use {'neovim/nvim-lspconfig', after = "coq_nvim"}
|
||||
use {
|
||||
'kabouzeid/nvim-lspinstall',
|
||||
config = function() require "plugins.lspinstall" end,
|
||||
after = 'nvim-lspconfig'
|
||||
}
|
||||
use {
|
||||
'ms-jpq/coq_nvim',
|
||||
branch = 'coq',
|
||||
event = 'BufEnter',
|
||||
run = ':COQdeps',
|
||||
config = function() require "plugins.coq" end
|
||||
}
|
||||
use {
|
||||
'ms-jpq/coq.artifacts',
|
||||
run = ':COQdeps',
|
||||
after = 'coq_nvim',
|
||||
branch = 'artifacts'
|
||||
}
|
||||
|
||||
-- formating and editing
|
||||
use {"sbdchd/neoformat", cmd = "Neoformat"}
|
||||
use {
|
||||
"mattn/emmet-vim",
|
||||
event = "FileType html,css",
|
||||
setup = function() require "plugins.emmet" end
|
||||
}
|
||||
use {"machakann/vim-sandwich", event = "BufRead"}
|
||||
-- formating and editing
|
||||
use {"sbdchd/neoformat", cmd = "Neoformat"}
|
||||
use {
|
||||
"mattn/emmet-vim",
|
||||
event = "FileType html,css",
|
||||
setup = function() require "plugins.emmet" end
|
||||
}
|
||||
use {"machakann/vim-sandwich", event = "BufRead"}
|
||||
|
||||
use {
|
||||
"terrortylor/nvim-comment",
|
||||
config = function() require('nvim_comment').setup() end,
|
||||
cmd = "CommentToggle"
|
||||
}
|
||||
use {
|
||||
"windwp/nvim-autopairs",
|
||||
after = "coq_nvim",
|
||||
config = function() require("plugins.nvim-autopairs") end
|
||||
}
|
||||
use {
|
||||
"terrortylor/nvim-comment",
|
||||
config = function() require('nvim_comment').setup() end,
|
||||
cmd = "CommentToggle"
|
||||
}
|
||||
use {
|
||||
"windwp/nvim-autopairs",
|
||||
after = "coq_nvim",
|
||||
config = function() require("plugins.nvim-autopairs") end
|
||||
}
|
||||
|
||||
-- navigation
|
||||
use {
|
||||
'kyazdani42/nvim-tree.lua',
|
||||
cmd = 'NvimTreeToggle',
|
||||
requires = 'kyazdani42/nvim-web-devicons'
|
||||
}
|
||||
use {
|
||||
"vimwiki/vimwiki",
|
||||
cmd = "VimwikiIndex",
|
||||
setup = function() require "plugins.vimwiki" end
|
||||
}
|
||||
use {
|
||||
'andymass/vim-matchup',
|
||||
after = 'nvim-treesitter',
|
||||
config = function() require "plugins.matchup" end
|
||||
}
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = {{'nvim-lua/plenary.nvim'}},
|
||||
cmd = 'Telescope'
|
||||
}
|
||||
use {
|
||||
'phaazon/hop.nvim',
|
||||
event = "BufRead",
|
||||
as = 'hop',
|
||||
config = function()
|
||||
require'hop'.setup {keys = 'etovxqpdygfblzhckisuran'}
|
||||
end
|
||||
}
|
||||
-- navigation
|
||||
use {
|
||||
'kyazdani42/nvim-tree.lua',
|
||||
cmd = 'NvimTreeToggle',
|
||||
requires = 'kyazdani42/nvim-web-devicons'
|
||||
}
|
||||
use {
|
||||
"vimwiki/vimwiki",
|
||||
cmd = "VimwikiIndex",
|
||||
setup = function() require "plugins.vimwiki" end
|
||||
}
|
||||
use {
|
||||
'andymass/vim-matchup',
|
||||
after = 'nvim-treesitter',
|
||||
config = function() require "plugins.matchup" end
|
||||
}
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = {{'nvim-lua/plenary.nvim'}},
|
||||
cmd = 'Telescope'
|
||||
}
|
||||
use {
|
||||
'phaazon/hop.nvim',
|
||||
event = "BufRead",
|
||||
as = 'hop',
|
||||
config = function()
|
||||
require'hop'.setup {keys = 'etovxqpdygfblzhckisuran'}
|
||||
end
|
||||
}
|
||||
|
||||
-- eye-candy
|
||||
use {
|
||||
'sunjon/shade.nvim',
|
||||
event = "BufAdd",
|
||||
config = function() require "plugins.shade" end
|
||||
}
|
||||
use {
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
after = {"nvim-treesitter", "nvim-base16"},
|
||||
config = function() require "plugins.indent-blankline" end
|
||||
}
|
||||
use {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
requires = {'nvim-lua/plenary.nvim'},
|
||||
config = function() require('gitsigns').setup() end
|
||||
}
|
||||
use {
|
||||
'p00f/nvim-ts-rainbow',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require "plugins.nvim-ts-rainbow" end
|
||||
}
|
||||
use {
|
||||
'winston0410/range-highlight.nvim',
|
||||
event = "BufRead",
|
||||
config = function() require("range-highlight").setup {} end,
|
||||
requires = 'winston0410/cmd-parser.nvim'
|
||||
}
|
||||
use {
|
||||
'norcalli/nvim-colorizer.lua',
|
||||
event = "BufRead",
|
||||
config = function() require'colorizer'.setup() end
|
||||
}
|
||||
-- eye-candy
|
||||
use {
|
||||
'sunjon/shade.nvim',
|
||||
event = "VimEnter",
|
||||
config = function() require "plugins.shade" end
|
||||
}
|
||||
use {
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
after = {"nvim-treesitter", "nvim-base16"},
|
||||
config = function() require "plugins.indent-blankline" end
|
||||
}
|
||||
use {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
requires = {'nvim-lua/plenary.nvim'},
|
||||
config = function() require('gitsigns').setup() end
|
||||
}
|
||||
use {
|
||||
'p00f/nvim-ts-rainbow',
|
||||
after = "nvim-treesitter",
|
||||
config = function() require "plugins.nvim-ts-rainbow" end
|
||||
}
|
||||
use {
|
||||
'winston0410/range-highlight.nvim',
|
||||
event = "BufRead",
|
||||
config = function() require("range-highlight").setup {} end,
|
||||
requires = 'winston0410/cmd-parser.nvim'
|
||||
}
|
||||
use {
|
||||
'norcalli/nvim-colorizer.lua',
|
||||
event = "BufRead",
|
||||
config = function() require'colorizer'.setup() end
|
||||
}
|
||||
|
||||
-- integrations
|
||||
use {'michaelb/sniprun', run = 'bash ./install.sh', cmd = "SnipRun"}
|
||||
use {"tpope/vim-fugitive", cmd = "G"}
|
||||
-- integrations
|
||||
use {'michaelb/sniprun', run = 'bash ./install.sh', cmd = "SnipRun"}
|
||||
use {"tpope/vim-fugitive", cmd = "G"}
|
||||
|
||||
end)
|
||||
|
||||
@ -1,7 +1,4 @@
|
||||
require'shade'.setup({
|
||||
overlay_opacity = 50,
|
||||
opacity_step = 1,
|
||||
keys = {
|
||||
toggle = '<Leader>s',
|
||||
}
|
||||
overlay_opacity = 70,
|
||||
keys = {toggle = '<Leader>s'}
|
||||
})
|
||||
|
||||
@ -141,6 +141,9 @@ _G.packer_plugins = {
|
||||
["nvim-base16"] = {
|
||||
after = { "indent-blankline.nvim" },
|
||||
config = { "\27LJ\1\2.\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\19plugins.base16\frequire\0" },
|
||||
load_after = {
|
||||
["packer.nvim"] = true
|
||||
},
|
||||
loaded = false,
|
||||
needs_bufread = false,
|
||||
path = "/home/juan/.local/share/nvim/site/pack/packer/opt/nvim-base16"
|
||||
@ -208,7 +211,7 @@ _G.packer_plugins = {
|
||||
path = "/home/juan/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons"
|
||||
},
|
||||
["packer.nvim"] = {
|
||||
after = { "nvim-web-devicons" },
|
||||
after = { "nvim-web-devicons", "nvim-base16" },
|
||||
loaded = false,
|
||||
needs_bufread = false,
|
||||
path = "/home/juan/.local/share/nvim/site/pack/packer/opt/packer.nvim"
|
||||
@ -308,11 +311,10 @@ vim.cmd [[augroup packer_load_aucmds]]
|
||||
vim.cmd [[au!]]
|
||||
-- Event lazy-loads
|
||||
time([[Defining lazy-load event autocommands]], true)
|
||||
vim.cmd [[au BufRead * ++once lua require("packer.load")({'vim-sandwich', 'nvim-colorizer.lua', 'range-highlight.nvim', 'hop'}, { event = "BufRead *" }, _G.packer_plugins)]]
|
||||
vim.cmd [[au BufAdd * ++once lua require("packer.load")({'shade.nvim'}, { event = "BufAdd *" }, _G.packer_plugins)]]
|
||||
vim.cmd [[au VimEnter * ++once lua require("packer.load")({'nvim-treesitter', 'packer.nvim', 'nvim-base16'}, { event = "VimEnter *" }, _G.packer_plugins)]]
|
||||
vim.cmd [[au FileType html,css ++once lua require("packer.load")({'emmet-vim'}, { event = "FileType html,css" }, _G.packer_plugins)]]
|
||||
vim.cmd [[au BufEnter * ++once lua require("packer.load")({'coq_nvim'}, { event = "BufEnter *" }, _G.packer_plugins)]]
|
||||
vim.cmd [[au FileType html,css ++once lua require("packer.load")({'emmet-vim'}, { event = "FileType html,css" }, _G.packer_plugins)]]
|
||||
vim.cmd [[au VimEnter * ++once lua require("packer.load")({'nvim-treesitter', 'packer.nvim', 'shade.nvim'}, { event = "VimEnter *" }, _G.packer_plugins)]]
|
||||
vim.cmd [[au BufRead * ++once lua require("packer.load")({'vim-sandwich', 'nvim-colorizer.lua', 'range-highlight.nvim', 'hop'}, { event = "BufRead *" }, _G.packer_plugins)]]
|
||||
time([[Defining lazy-load event autocommands]], false)
|
||||
vim.cmd("augroup END")
|
||||
if should_profile then save_profiles() end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user