mirror of
https://github.com/jessebot/dot_files.git
synced 2025-10-01 01:48:43 +00:00
updating neovim to have scrollbar and better colors
This commit is contained in:
parent
d6cdaf1f2a
commit
38955b5458
5 changed files with 122 additions and 84 deletions
|
@ -36,15 +36,26 @@ vim.cmd.source("~/.config/nvim/packerinit.vim")
|
|||
vim.cmd.colorscheme('spacechalk')
|
||||
vim.g.colors_name = 'spacechalk'
|
||||
|
||||
-- tab completion for coc - conquer of completion
|
||||
vim.cmd.source("~/.config/nvim/vim/coc-nvim.vim")
|
||||
|
||||
-- --- these are plugin configs for plugins imported by packer ---
|
||||
require('user.fterm')
|
||||
-- require('user.mini-map')
|
||||
-- require('user.nvim-colorizer')
|
||||
-- require('mini.map').setup()
|
||||
require('user.nvim-colorizer')
|
||||
require('user.nvim-tree')
|
||||
require('user.tree-sitter')
|
||||
require('user.ale')
|
||||
require("scrollbar").setup({
|
||||
set_highlights = false,
|
||||
handlers = {
|
||||
cursor = true,
|
||||
diagnostic = true,
|
||||
handle = true,
|
||||
-- search = false, -- Requires hlslens
|
||||
ale = true,
|
||||
},
|
||||
})
|
||||
require('user.airline')
|
||||
require('user.dashboard')
|
||||
require('user.folding')
|
||||
-- tab completion for coc - conquer of completion
|
||||
vim.cmd.source("~/.config/nvim/vim/coc-nvim.vim")
|
||||
|
|
|
@ -4,7 +4,6 @@ local ensure_packer = function()
|
|||
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
||||
-- I don't know why treesitter fails here :shrug:
|
||||
vim.cmd("packadd packer.nvim")
|
||||
return true
|
||||
end
|
||||
|
@ -15,30 +14,27 @@ local packer_bootstrap = ensure_packer()
|
|||
|
||||
return require('packer').startup(function(use)
|
||||
|
||||
-- Packer can manage itself
|
||||
-- Packer, our neovim plugin manager, can manage itself
|
||||
use {'wbthomason/packer.nvim'}
|
||||
|
||||
-- preferred colorscheme right now
|
||||
use {'space-chalk/spacechalk.vim'}
|
||||
|
||||
-- adds a pretty status line -- 'vim-airline/vim-airline'
|
||||
use {'vim-airline/vim-airline'}
|
||||
|
||||
-- startup screen for neovim
|
||||
-- -------------------- startup screen for neovim ------------------------
|
||||
use {'glepnir/dashboard-nvim'}
|
||||
|
||||
-- cute halloween dashboard for neovim start screen :3
|
||||
-- use {'folke/drop.nvim'}
|
||||
|
||||
-- quick session manager (requires :PackerCompile)
|
||||
use({'glepnir/dbsession.nvim', event = 'BufRead',
|
||||
config = function() require('dbsession').setup({}) end
|
||||
})
|
||||
|
||||
-- this is a modern fuzzy searcher
|
||||
use {'liuchengxu/vim-clap'}
|
||||
-- cute halloween dashboard for neovim start screen :3
|
||||
-- use {'folke/drop.nvim'}
|
||||
|
||||
-- ------------------ floating window plugins --------------------------
|
||||
|
||||
-- -------------------------- status line --------------------------------
|
||||
-- may replace soon, because it is very crowded
|
||||
use {'vim-airline/vim-airline'}
|
||||
|
||||
|
||||
-- -------------------- floating window plugins --------------------------
|
||||
-- terminal window
|
||||
use {"numToStr/FTerm.nvim"}
|
||||
|
||||
|
@ -49,11 +45,18 @@ return require('packer').startup(function(use)
|
|||
-- this is more stuff for floating windows
|
||||
use {'MunifTanjim/nui.nvim'}
|
||||
|
||||
-- ------------ telescope: extendable fuzzy finder over lists ------------
|
||||
use {'nvim-telescope/telescope.nvim', tag = '0.1.0',
|
||||
requires = {{'nvim-lua/plenary.nvim'} }
|
||||
|
||||
-- ------------------------- file directory tree -------------------------
|
||||
-- nvim new nerdtree replacement
|
||||
use {
|
||||
'nvim-tree/nvim-tree.lua',
|
||||
requires = {'nvim-tree/nvim-web-devicons'},
|
||||
tag = 'nightly'
|
||||
}
|
||||
|
||||
-- ---------------- scroll bar for the right hand side -------------------
|
||||
use {"petertriho/nvim-scrollbar"}
|
||||
|
||||
-- ------------------------------ git ------------------------------------
|
||||
-- git plugin for running git commands with :git -- 'tpope/vim-fugitive'
|
||||
use {'tpope/vim-fugitive'}
|
||||
|
@ -62,49 +65,58 @@ return require('packer').startup(function(use)
|
|||
-- 'airblade/vim-gitgutter'
|
||||
use {'airblade/vim-gitgutter'}
|
||||
|
||||
-- ----------- nvim new nerdtree replacement needs this :) ---------------
|
||||
use {
|
||||
'nvim-tree/nvim-tree.lua',
|
||||
requires = {'nvim-tree/nvim-web-devicons'},
|
||||
tag = 'nightly'
|
||||
}
|
||||
-- ---------------- syntax highlighting installer ------------------------
|
||||
-- preferred colorscheme right now
|
||||
use {'space-chalk/spacechalk.vim'}
|
||||
|
||||
-- ------- a mini map of where you are in your code -----------------
|
||||
-- not working for some reason?
|
||||
use { 'echasnovski/mini.map', branch = 'main' }
|
||||
|
||||
-- -------------------- Language Specific Stuff ------------------------
|
||||
|
||||
-- for highlighting hex colors for colorscheme editing
|
||||
use {'norcalli/nvim-colorizer.lua'}
|
||||
|
||||
-- general linter - will use common linters and highlight broken code
|
||||
use {'dense-analysis/ale'}
|
||||
|
||||
-- syntax highlighting for neovim
|
||||
use {'nvim-treesitter/nvim-treesitter'}
|
||||
-- I have this mostly for the :TSHighlightCapturesUnderCursor command
|
||||
-- https://github.com/nvim-treesitter/playground/pull/9
|
||||
use {'nvim-treesitter/playground'}
|
||||
|
||||
-- terraform linter -- 'hashivim/vim-terraform'
|
||||
use {'hashivim/vim-terraform'}
|
||||
-- This is helpful for markdown -- 'junegunn/limelight.config/vim'
|
||||
use {'junegunn/limelight.vim'}
|
||||
|
||||
-- bash tab completion -- 'WolfgangMehner/bash-support' -- coc may replace?
|
||||
-- use {'WolfgangMehner/bash-support'}
|
||||
-- ------------------------- general linter ------------------------------
|
||||
-- will use common linters and highlight broken code
|
||||
use {'dense-analysis/ale'}
|
||||
|
||||
-- --------------------- completion and searching ------------------------
|
||||
-- telescope: extendable fuzzy finder over lists
|
||||
use {'nvim-telescope/telescope.nvim', tag = '0.1.0',
|
||||
requires = {{'nvim-lua/plenary.nvim'} }
|
||||
}
|
||||
|
||||
-- this is a modern fuzzy searcher; not sure if it's really useful in neovim
|
||||
use {'liuchengxu/vim-clap'}
|
||||
|
||||
-- code completion
|
||||
use {'neoclide/coc.nvim', branch = 'release'}
|
||||
|
||||
-- yaml syntax highlighting better -- 'stephpy/vim-yaml' treesitter may replace?
|
||||
-- use {'stephpy/vim-yaml'}
|
||||
-- --------------------- Language Specific Stuff -------------------------
|
||||
|
||||
-- This is helpful for markdown -- 'junegunn/limelight.config/vim'
|
||||
use {'junegunn/limelight.vim'}
|
||||
-- for highlighting hex colors (in vim, CSS, JS, HTML)
|
||||
use {'norcalli/nvim-colorizer.lua'}
|
||||
|
||||
-- bash tab completion -- 'WolfgangMehner/bash-support' -- coc may replace?
|
||||
-- use {'WolfgangMehner/bash-support'}
|
||||
|
||||
-- logging syntax and highlighting -- 'mtdl9/vim-log-highlighting'
|
||||
use {'mtdl9/vim-log-highlighting'}
|
||||
|
||||
-- lua folding
|
||||
use{'anuvyklack/pretty-fold.nvim',
|
||||
config = function()
|
||||
require('pretty-fold').setup()
|
||||
end
|
||||
}
|
||||
|
||||
-- terraform commands for neovim :)
|
||||
use {'hashivim/vim-terraform'}
|
||||
|
||||
-- yaml syntax highlighting better -- 'stephpy/vim-yaml' treesitter may replace?
|
||||
-- use {'stephpy/vim-yaml'}
|
||||
|
||||
-- Automatically set up your configuration after cloning packer.nvim
|
||||
-- Put this at the end after all plugins
|
||||
if packer_bootstrap then
|
||||
|
|
|
@ -125,7 +125,7 @@ _G.dashNewFile = function()
|
|||
},
|
||||
relative = 'editor',
|
||||
win_options = {
|
||||
winhighlight = 'Normal:String,FloatBorder:VertSplit',
|
||||
winhighlight = 'Normal:Normal,FloatBorder:LineNr',
|
||||
},
|
||||
},
|
||||
-- prompt for user
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require'nvim-treesitter.configs'.setup {
|
||||
-- A list of parser names, or "all"
|
||||
ensure_installed = { "lua", "yaml", "bash", "hcl", "python", "kdl" },
|
||||
ensure_installed = { "lua", "yaml", "bash", "hcl", "python", "kdl", "toml" },
|
||||
|
||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||
sync_install = true,
|
||||
|
@ -10,7 +10,7 @@ require'nvim-treesitter.configs'.setup {
|
|||
auto_install = true,
|
||||
|
||||
-- List of parsers to ignore installing (for "all")
|
||||
ignore_install = { "toml"},
|
||||
-- ignore_install = { "toml"},
|
||||
|
||||
---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
|
||||
-- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
|
||||
|
@ -23,7 +23,7 @@ require'nvim-treesitter.configs'.setup {
|
|||
-- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
|
||||
-- the name of the parser)
|
||||
-- list of language that will be disabled
|
||||
disable = { "toml"},
|
||||
-- disable = { "toml"},
|
||||
|
||||
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||
|
|
|
@ -49,8 +49,8 @@ local function save_profiles(threshold)
|
|||
end
|
||||
|
||||
time([[Luarocks path setup]], true)
|
||||
local package_path_str = "/Users/jesse/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/jesse/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/jesse/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/jesse/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||
local install_cpath_pattern = "/Users/jesse/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
|
||||
local package_path_str = "/Users/jhitch/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/jhitch/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/jhitch/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/jhitch/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||
local install_cpath_pattern = "/Users/jhitch/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
|
||||
if not string.find(package.path, package_path_str, 1, true) then
|
||||
package.path = package.path .. ';' .. package_path_str
|
||||
end
|
||||
|
@ -76,17 +76,22 @@ time([[Defining packer_plugins]], true)
|
|||
_G.packer_plugins = {
|
||||
["FTerm.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/FTerm.nvim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/FTerm.nvim",
|
||||
url = "https://github.com/numToStr/FTerm.nvim"
|
||||
},
|
||||
ale = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/ale",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/ale",
|
||||
url = "https://github.com/dense-analysis/ale"
|
||||
},
|
||||
["coc.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/coc.nvim",
|
||||
url = "https://github.com/neoclide/coc.nvim"
|
||||
},
|
||||
["dashboard-nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/dashboard-nvim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/dashboard-nvim",
|
||||
url = "https://github.com/glepnir/dashboard-nvim"
|
||||
},
|
||||
["dbsession.nvim"] = {
|
||||
|
@ -94,107 +99,117 @@ _G.packer_plugins = {
|
|||
loaded = false,
|
||||
needs_bufread = false,
|
||||
only_cond = false,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/opt/dbsession.nvim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/opt/dbsession.nvim",
|
||||
url = "https://github.com/glepnir/dbsession.nvim"
|
||||
},
|
||||
["limelight.vim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/limelight.vim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/limelight.vim",
|
||||
url = "https://github.com/junegunn/limelight.vim"
|
||||
},
|
||||
["mini.map"] = {
|
||||
["nui.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/mini.map",
|
||||
url = "https://github.com/echasnovski/mini.map"
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nui.nvim",
|
||||
url = "https://github.com/MunifTanjim/nui.nvim"
|
||||
},
|
||||
["nvim-colorizer.lua"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
|
||||
url = "https://github.com/norcalli/nvim-colorizer.lua"
|
||||
},
|
||||
["nvim-k8s"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/nvim-k8s",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-k8s",
|
||||
url = "https://github.com/hsalem7/nvim-k8s"
|
||||
},
|
||||
["nvim-scrollbar"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-scrollbar",
|
||||
url = "https://github.com/petertriho/nvim-scrollbar"
|
||||
},
|
||||
["nvim-tree.lua"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
|
||||
url = "https://github.com/nvim-tree/nvim-tree.lua"
|
||||
},
|
||||
["nvim-treesitter"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
["nvim-web-devicons"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
|
||||
url = "https://github.com/nvim-tree/nvim-web-devicons"
|
||||
},
|
||||
["packer.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||
url = "https://github.com/wbthomason/packer.nvim"
|
||||
},
|
||||
playground = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/playground",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/playground",
|
||||
url = "https://github.com/nvim-treesitter/playground"
|
||||
},
|
||||
["plenary.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||
url = "https://github.com/nvim-lua/plenary.nvim"
|
||||
},
|
||||
["pretty-fold.nvim"] = {
|
||||
config = { "\27LJ\2\n9\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\16pretty-fold\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/pretty-fold.nvim",
|
||||
url = "https://github.com/anuvyklack/pretty-fold.nvim"
|
||||
},
|
||||
["spacechalk.vim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/spacechalk.vim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/spacechalk.vim",
|
||||
url = "https://github.com/space-chalk/spacechalk.vim"
|
||||
},
|
||||
["telescope.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||
url = "https://github.com/nvim-telescope/telescope.nvim"
|
||||
},
|
||||
["vim-airline"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/vim-airline",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/vim-airline",
|
||||
url = "https://github.com/vim-airline/vim-airline"
|
||||
},
|
||||
["vim-clap"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/vim-clap",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/vim-clap",
|
||||
url = "https://github.com/liuchengxu/vim-clap"
|
||||
},
|
||||
["vim-fugitive"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/vim-fugitive",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/vim-fugitive",
|
||||
url = "https://github.com/tpope/vim-fugitive"
|
||||
},
|
||||
["vim-gitgutter"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
|
||||
url = "https://github.com/airblade/vim-gitgutter"
|
||||
},
|
||||
["vim-log-highlighting"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/vim-log-highlighting",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/vim-log-highlighting",
|
||||
url = "https://github.com/mtdl9/vim-log-highlighting"
|
||||
},
|
||||
["vim-terraform"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/vim-terraform",
|
||||
path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/vim-terraform",
|
||||
url = "https://github.com/hashivim/vim-terraform"
|
||||
},
|
||||
["vim-yaml"] = {
|
||||
loaded = true,
|
||||
path = "/Users/jesse/.local/share/nvim/site/pack/packer/start/vim-yaml",
|
||||
url = "https://github.com/stephpy/vim-yaml"
|
||||
}
|
||||
}
|
||||
|
||||
time([[Defining packer_plugins]], false)
|
||||
-- Config for: pretty-fold.nvim
|
||||
time([[Config for pretty-fold.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n9\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\16pretty-fold\frequire\0", "config", "pretty-fold.nvim")
|
||||
time([[Config for pretty-fold.nvim]], false)
|
||||
vim.cmd [[augroup packer_load_aucmds]]
|
||||
vim.cmd [[au!]]
|
||||
-- Event lazy-loads
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue