lots more stuff
This commit is contained in:
parent
98d6570a08
commit
3ff6d828be
|
@ -1,5 +1,5 @@
|
||||||
window:
|
window:
|
||||||
opacity: 0.8
|
opacity: 0.95
|
||||||
|
|
||||||
font:
|
font:
|
||||||
size: 14
|
size: 14
|
||||||
|
|
|
@ -18,3 +18,31 @@ require("telescope").setup{
|
||||||
|
|
||||||
require("telescope").load_extension("fzf")
|
require("telescope").load_extension("fzf")
|
||||||
require("telescope").load_extension("file_browser")
|
require("telescope").load_extension("file_browser")
|
||||||
|
require("telescope").load_extension("neoclip")
|
||||||
|
require('Comment').setup()
|
||||||
|
require('nvim-treesitter').setup({
|
||||||
|
-- enable syntax highlighting
|
||||||
|
highlight = {
|
||||||
|
enable = true,
|
||||||
|
},
|
||||||
|
-- enable indentation
|
||||||
|
indent = { enable = true },
|
||||||
|
-- enable autotagging (w/ nvim-ts-autotag plugin)
|
||||||
|
autotag = { enable = true },
|
||||||
|
-- ensure these language parsers are installed
|
||||||
|
ensure_installed = {
|
||||||
|
"json",
|
||||||
|
"yaml",
|
||||||
|
"html",
|
||||||
|
"css",
|
||||||
|
"markdown",
|
||||||
|
"bash",
|
||||||
|
"lua",
|
||||||
|
"vim",
|
||||||
|
"dockerfile",
|
||||||
|
"gitignore",
|
||||||
|
"python",
|
||||||
|
},
|
||||||
|
-- auto install above language parsers
|
||||||
|
auto_install = true,
|
||||||
|
})
|
||||||
|
|
|
@ -2,9 +2,11 @@
|
||||||
-- vim.cmd("colorscheme ayu")
|
-- vim.cmd("colorscheme ayu")
|
||||||
-- vim.cmd("let ayucolor='mirage'")
|
-- vim.cmd("let ayucolor='mirage'")
|
||||||
-- vim.cmd("colorscheme gruvbox")
|
-- vim.cmd("colorscheme gruvbox")
|
||||||
-- vim.cmd("colorscheme tender")
|
vim.cmd("colorscheme tender")
|
||||||
-- vim.cmd("colorscheme railscasts")
|
-- vim.cmd("colorscheme railscasts")
|
||||||
-- vim.cmd("colorscheme desert-warm-256")
|
-- vim.cmd("colorscheme desert-warm-256")
|
||||||
vim.cmd("colorscheme deus")
|
-- vim.cmd("colorscheme deus")
|
||||||
|
|
||||||
|
-- Ignore background color for transparency
|
||||||
vim.cmd("highlight Normal ctermbg=none")
|
vim.cmd("highlight Normal ctermbg=none")
|
||||||
vim.cmd("highlight NonText ctermbg=none")
|
vim.cmd("highlight NonText ctermbg=none")
|
||||||
|
|
|
@ -5,6 +5,18 @@
|
||||||
local keymap = vim.api.nvim_set_keymap
|
local keymap = vim.api.nvim_set_keymap
|
||||||
local default_ops = { noremap = true, silent = true }
|
local default_ops = { noremap = true, silent = true }
|
||||||
|
|
||||||
|
-- Quick escape insert mode
|
||||||
|
keymap('i', 'jk', '<Esc>', default_ops)
|
||||||
|
|
||||||
|
-- Delete single character without copying into register
|
||||||
|
keymap("n", "x", '"_x', default_ops)
|
||||||
|
|
||||||
|
-- Window management
|
||||||
|
keymap("n", "<leader>sv", "<C-w>v", default_ops)
|
||||||
|
keymap("n", "<leader>sh", "<C-w>s", default_ops)
|
||||||
|
keymap("n", "<leader>se", "<C-w>=", default_ops)
|
||||||
|
keymap("n", "<leader>sx", ":close<CR>", default_ops)
|
||||||
|
|
||||||
-- Save, Save/Quit
|
-- Save, Save/Quit
|
||||||
keymap('n', '<F1>', ':w<CR>', default_ops)
|
keymap('n', '<F1>', ':w<CR>', default_ops)
|
||||||
keymap('n', '<F2>', ':wq<CR>', default_ops)
|
keymap('n', '<F2>', ':wq<CR>', default_ops)
|
||||||
|
@ -29,3 +41,7 @@ keymap('n', '<Leader>ff', ':Telescope find_files hidden=true<CR>', default_ops)
|
||||||
keymap('n', '<Leader>gf', ':Telescope git_files<CR>', default_ops)
|
keymap('n', '<Leader>gf', ':Telescope git_files<CR>', default_ops)
|
||||||
keymap('n', '<Leader>lg', ':Telescope live_grep<CR>', default_ops)
|
keymap('n', '<Leader>lg', ':Telescope live_grep<CR>', default_ops)
|
||||||
keymap('n', '<Leader>d', ':Telescope diagnostics<CR>', default_ops)
|
keymap('n', '<Leader>d', ':Telescope diagnostics<CR>', default_ops)
|
||||||
|
keymap('n', '<Leader>h', ':Telescope neoclip<CR>', default_ops)
|
||||||
|
|
||||||
|
-- Buffers
|
||||||
|
keymap('n', '<Leader>b', ':JABSOpen<CR>', default_ops)
|
||||||
|
|
|
@ -6,6 +6,12 @@ return require('packer').startup(function(use)
|
||||||
|
|
||||||
-- LSP
|
-- LSP
|
||||||
use('neovim/nvim-lspconfig')
|
use('neovim/nvim-lspconfig')
|
||||||
|
use('hrsh7th/cmp-nvim-lsp')
|
||||||
|
use('hrsh7th/cmp-nvim-lua')
|
||||||
|
use('hrsh7th/cmp-buffer')
|
||||||
|
use('hrsh7th/cmp-path')
|
||||||
|
use('hrsh7th/nvim-cmp')
|
||||||
|
use('saadparwaiz1/cmp_luasnip')
|
||||||
|
|
||||||
-- colorschemes
|
-- colorschemes
|
||||||
use('ayu-theme/ayu-vim')
|
use('ayu-theme/ayu-vim')
|
||||||
|
@ -31,24 +37,9 @@ return require('packer').startup(function(use)
|
||||||
-- SuperTab
|
-- SuperTab
|
||||||
use('ervandew/supertab')
|
use('ervandew/supertab')
|
||||||
|
|
||||||
-- Auto-Complete
|
-- Vim-surround
|
||||||
-- use('ncm2/ncm2')
|
use('tpope/vim-surround')
|
||||||
-- use('roxma/nvim-yarp')
|
|
||||||
-- -- enable ncm2 for all buffers
|
|
||||||
-- -- autocmd BufEnter * call ncm2#enable_for_buffer()
|
|
||||||
-- -- IMPORTANT: :help Ncm2PopupOpen for more information
|
|
||||||
-- -- set completeopt=noinsert,menuone,noselect
|
|
||||||
-- use('ncm2/ncm2-bufword') -- Basic completion
|
|
||||||
-- use('ncm2/ncm2-path') -- Path completion
|
|
||||||
-- use('ncm2/ncm2-jedi') -- Python completion
|
|
||||||
|
|
||||||
-- better auto complete maybe
|
|
||||||
use('hrsh7th/cmp-nvim-lsp')
|
|
||||||
use('hrsh7th/cmp-nvim-lua')
|
|
||||||
use('hrsh7th/cmp-buffer')
|
|
||||||
use('hrsh7th/cmp-path')
|
|
||||||
use('hrsh7th/nvim-cmp')
|
|
||||||
use('saadparwaiz1/cmp_luasnip')
|
|
||||||
-- Slime, for tmux repl-ing
|
-- Slime, for tmux repl-ing
|
||||||
use('jpalardy/vim-slime')
|
use('jpalardy/vim-slime')
|
||||||
|
|
||||||
|
@ -59,8 +50,37 @@ return require('packer').startup(function(use)
|
||||||
use( "nvim-telescope/telescope-file-browser.nvim")
|
use( "nvim-telescope/telescope-file-browser.nvim")
|
||||||
|
|
||||||
-- Treesitter
|
-- Treesitter
|
||||||
-- use('nvim-treesitter/nvim-treesitter')
|
use{'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
|
||||||
|
|
||||||
-- Devicons
|
-- Devicons
|
||||||
use('kyazdani42/nvim-web-devicons')
|
use('kyazdani42/nvim-web-devicons')
|
||||||
|
|
||||||
|
-- Registry history
|
||||||
|
use {
|
||||||
|
"AckslD/nvim-neoclip.lua",
|
||||||
|
requires = {
|
||||||
|
{'kkharji/sqlite.lua', module = 'sqlite'},
|
||||||
|
{'nvim-telescope/telescope.nvim'},
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require('neoclip').setup({
|
||||||
|
enable_persistent_history = true,
|
||||||
|
continuous_sync = true
|
||||||
|
}
|
||||||
|
)
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Buffers
|
||||||
|
use('matbme/JABS.nvim')
|
||||||
|
require("jabs").setup {}
|
||||||
|
|
||||||
|
-- Comments
|
||||||
|
use {
|
||||||
|
'numToStr/Comment.nvim',
|
||||||
|
config = function()
|
||||||
|
require('Comment').setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -79,6 +79,31 @@ _G.packer_plugins = {
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ayu-vim",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ayu-vim",
|
||||||
url = "https://github.com/ayu-theme/ayu-vim"
|
url = "https://github.com/ayu-theme/ayu-vim"
|
||||||
},
|
},
|
||||||
|
["cmp-buffer"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-buffer",
|
||||||
|
url = "https://github.com/hrsh7th/cmp-buffer"
|
||||||
|
},
|
||||||
|
["cmp-nvim-lsp"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
|
||||||
|
url = "https://github.com/hrsh7th/cmp-nvim-lsp"
|
||||||
|
},
|
||||||
|
["cmp-nvim-lua"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua",
|
||||||
|
url = "https://github.com/hrsh7th/cmp-nvim-lua"
|
||||||
|
},
|
||||||
|
["cmp-path"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp-path",
|
||||||
|
url = "https://github.com/hrsh7th/cmp-path"
|
||||||
|
},
|
||||||
|
cmp_luasnip = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
|
||||||
|
url = "https://github.com/saadparwaiz1/cmp_luasnip"
|
||||||
|
},
|
||||||
gruvbox = {
|
gruvbox = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/gruvbox",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/gruvbox",
|
||||||
|
@ -89,26 +114,6 @@ _G.packer_plugins = {
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/minimalist",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/minimalist",
|
||||||
url = "https://github.com/dikiaap/minimalist"
|
url = "https://github.com/dikiaap/minimalist"
|
||||||
},
|
},
|
||||||
ncm2 = {
|
|
||||||
loaded = true,
|
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ncm2",
|
|
||||||
url = "https://github.com/ncm2/ncm2"
|
|
||||||
},
|
|
||||||
["ncm2-bufword"] = {
|
|
||||||
loaded = true,
|
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ncm2-bufword",
|
|
||||||
url = "https://github.com/ncm2/ncm2-bufword"
|
|
||||||
},
|
|
||||||
["ncm2-jedi"] = {
|
|
||||||
loaded = true,
|
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ncm2-jedi",
|
|
||||||
url = "https://github.com/ncm2/ncm2-jedi"
|
|
||||||
},
|
|
||||||
["ncm2-path"] = {
|
|
||||||
loaded = true,
|
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/ncm2-path",
|
|
||||||
url = "https://github.com/ncm2/ncm2-path"
|
|
||||||
},
|
|
||||||
nerdtree = {
|
nerdtree = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree",
|
||||||
|
@ -119,21 +124,27 @@ _G.packer_plugins = {
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree-git-plugin",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nerdtree-git-plugin",
|
||||||
url = "https://github.com/Xuyuanp/nerdtree-git-plugin"
|
url = "https://github.com/Xuyuanp/nerdtree-git-plugin"
|
||||||
},
|
},
|
||||||
|
["nvim-cmp"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-cmp",
|
||||||
|
url = "https://github.com/hrsh7th/nvim-cmp"
|
||||||
|
},
|
||||||
["nvim-lspconfig"] = {
|
["nvim-lspconfig"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
||||||
url = "https://github.com/neovim/nvim-lspconfig"
|
url = "https://github.com/neovim/nvim-lspconfig"
|
||||||
},
|
},
|
||||||
|
["nvim-neoclip.lua"] = {
|
||||||
|
config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fneoclip\frequire\0" },
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-neoclip.lua",
|
||||||
|
url = "https://github.com/AckslD/nvim-neoclip.lua"
|
||||||
|
},
|
||||||
["nvim-web-devicons"] = {
|
["nvim-web-devicons"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
|
||||||
url = "https://github.com/kyazdani42/nvim-web-devicons"
|
url = "https://github.com/kyazdani42/nvim-web-devicons"
|
||||||
},
|
},
|
||||||
["nvim-yarp"] = {
|
|
||||||
loaded = true,
|
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/nvim-yarp",
|
|
||||||
url = "https://github.com/roxma/nvim-yarp"
|
|
||||||
},
|
|
||||||
["packer.nvim"] = {
|
["packer.nvim"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||||
|
@ -174,6 +185,11 @@ _G.packer_plugins = {
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-airline",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-airline",
|
||||||
url = "https://github.com/vim-airline/vim-airline"
|
url = "https://github.com/vim-airline/vim-airline"
|
||||||
},
|
},
|
||||||
|
["vim-airline-themes"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-airline-themes",
|
||||||
|
url = "https://github.com/vim-airline/vim-airline-themes"
|
||||||
|
},
|
||||||
["vim-desert-warm-256"] = {
|
["vim-desert-warm-256"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-desert-warm-256",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-desert-warm-256",
|
||||||
|
@ -189,6 +205,11 @@ _G.packer_plugins = {
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-devicons",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-devicons",
|
||||||
url = "https://github.com/ryanoasis/vim-devicons"
|
url = "https://github.com/ryanoasis/vim-devicons"
|
||||||
},
|
},
|
||||||
|
["vim-fugitive"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-fugitive",
|
||||||
|
url = "https://github.com/tpope/vim-fugitive"
|
||||||
|
},
|
||||||
["vim-railscasts-theme"] = {
|
["vim-railscasts-theme"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-railscasts-theme",
|
path = "/Users/clintmccay/.local/share/nvim/site/pack/packer/start/vim-railscasts-theme",
|
||||||
|
@ -202,6 +223,10 @@ _G.packer_plugins = {
|
||||||
}
|
}
|
||||||
|
|
||||||
time([[Defining packer_plugins]], false)
|
time([[Defining packer_plugins]], false)
|
||||||
|
-- Config for: nvim-neoclip.lua
|
||||||
|
time([[Config for nvim-neoclip.lua]], true)
|
||||||
|
try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fneoclip\frequire\0", "config", "nvim-neoclip.lua")
|
||||||
|
time([[Config for nvim-neoclip.lua]], false)
|
||||||
|
|
||||||
_G._packer.inside_compile = false
|
_G._packer.inside_compile = false
|
||||||
if _G._packer.needs_bufread == true then
|
if _G._packer.needs_bufread == true then
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
set -g default-terminal "screen-256color"
|
set -g default-terminal "screen-256color"
|
||||||
|
|
||||||
# left status
|
# left status
|
||||||
set-window-option -g status-left " (( #S )) "
|
set-window-option -g status-left " [ #S ] "
|
||||||
set-window-option -g status-left-style "fg=blue bg=black"
|
set-window-option -g status-left-style "fg=blue bg=black"
|
||||||
set-window-option -g status-left-length 30
|
set-window-option -g status-left-length 30
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue