updates
This commit is contained in:
Michael Peters
parent
743b7e3400
commit
8a1f67d50f
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
plugin/
|
||||
plugin/**
|
||||
|
||||
@ -37,152 +37,154 @@ function M.config()
|
||||
jpg = "#c882e7",
|
||||
}
|
||||
|
||||
icons.set_icon {
|
||||
c = {
|
||||
icon = "",
|
||||
color = colors.c,
|
||||
name = "c",
|
||||
},
|
||||
css = {
|
||||
icon = "",
|
||||
color = colors.css,
|
||||
name = "css",
|
||||
},
|
||||
deb = {
|
||||
icon = "",
|
||||
color = colors.deb,
|
||||
name = "deb",
|
||||
},
|
||||
Dockerfile = {
|
||||
icon = "",
|
||||
color = colors.docker,
|
||||
name = "Dockerfile",
|
||||
},
|
||||
html = {
|
||||
icon = "",
|
||||
color = colors.html,
|
||||
name = "html",
|
||||
},
|
||||
js = {
|
||||
icon = "",
|
||||
color = colors.js,
|
||||
name = "js",
|
||||
},
|
||||
kt = {
|
||||
icon = "",
|
||||
color = colors.kt,
|
||||
name = "kt",
|
||||
},
|
||||
lock = {
|
||||
icon = "",
|
||||
color = colors.lock,
|
||||
name = "lock",
|
||||
},
|
||||
lua = {
|
||||
icon = "",
|
||||
color = colors.lua,
|
||||
name = "lua",
|
||||
},
|
||||
mp3 = {
|
||||
icon = "",
|
||||
color = colors.mp3,
|
||||
name = "mp3",
|
||||
},
|
||||
mp4 = {
|
||||
icon = "",
|
||||
color = colors.mp4,
|
||||
name = "mp4",
|
||||
},
|
||||
out = {
|
||||
icon = "",
|
||||
color = colors.out,
|
||||
name = "out",
|
||||
},
|
||||
py = {
|
||||
icon = "",
|
||||
color = colors.py,
|
||||
name = "py",
|
||||
},
|
||||
["robots.txt"] = {
|
||||
icon = "ﮧ",
|
||||
color = colors.robot,
|
||||
name = "robots",
|
||||
},
|
||||
toml = {
|
||||
icon = "",
|
||||
color = colors.toml,
|
||||
name = "toml",
|
||||
},
|
||||
ts = {
|
||||
icon = "",
|
||||
color = colors.ts,
|
||||
name = "ts",
|
||||
},
|
||||
ttf = {
|
||||
icon = "",
|
||||
color = colors.ttf,
|
||||
name = "TrueTypeFont",
|
||||
},
|
||||
rb = {
|
||||
icon = "",
|
||||
color = colors.rb,
|
||||
name = "rb",
|
||||
},
|
||||
rpm = {
|
||||
icon = "",
|
||||
color = colors.rpm,
|
||||
name = "rpm",
|
||||
},
|
||||
vue = {
|
||||
icon = "﵂",
|
||||
color = colors.vue,
|
||||
name = "vue",
|
||||
},
|
||||
woff = {
|
||||
icon = "",
|
||||
color = colors.woff,
|
||||
name = "WebOpenFontFormat",
|
||||
},
|
||||
woff2 = {
|
||||
icon = "",
|
||||
color = colors.woff2,
|
||||
name = "WebOpenFontFormat2",
|
||||
},
|
||||
xz = {
|
||||
icon = "",
|
||||
color = colors.zip,
|
||||
name = "xz",
|
||||
},
|
||||
zip = {
|
||||
icon = "",
|
||||
color = colors.zip,
|
||||
name = "zip",
|
||||
},
|
||||
jsx = {
|
||||
icon = "ﰆ",
|
||||
color = colors.jsx,
|
||||
name = "jsx",
|
||||
},
|
||||
rust = {
|
||||
icon = "",
|
||||
color = colors.rs,
|
||||
name = "rs",
|
||||
},
|
||||
jpg = {
|
||||
icon = "",
|
||||
color = colors.jpg,
|
||||
name = "jpg",
|
||||
},
|
||||
png = {
|
||||
icon = "",
|
||||
color = colors.png,
|
||||
name = "png",
|
||||
},
|
||||
jpeg = {
|
||||
icon = "",
|
||||
color = colors.jpeg,
|
||||
name = "jpeg",
|
||||
},
|
||||
icons.setup {
|
||||
override = {
|
||||
c = {
|
||||
icon = "",
|
||||
color = colors.c,
|
||||
name = "c",
|
||||
},
|
||||
css = {
|
||||
icon = "",
|
||||
color = colors.css,
|
||||
name = "css",
|
||||
},
|
||||
deb = {
|
||||
icon = "",
|
||||
color = colors.deb,
|
||||
name = "deb",
|
||||
},
|
||||
Dockerfile = {
|
||||
icon = "",
|
||||
color = colors.docker,
|
||||
name = "Dockerfile",
|
||||
},
|
||||
html = {
|
||||
icon = "",
|
||||
color = colors.html,
|
||||
name = "html",
|
||||
},
|
||||
js = {
|
||||
icon = "",
|
||||
color = colors.js,
|
||||
name = "js",
|
||||
},
|
||||
kt = {
|
||||
icon = "",
|
||||
color = colors.kt,
|
||||
name = "kt",
|
||||
},
|
||||
lock = {
|
||||
icon = "",
|
||||
color = colors.lock,
|
||||
name = "lock",
|
||||
},
|
||||
lua = {
|
||||
icon = "",
|
||||
color = colors.lua,
|
||||
name = "lua",
|
||||
},
|
||||
mp3 = {
|
||||
icon = "",
|
||||
color = colors.mp3,
|
||||
name = "mp3",
|
||||
},
|
||||
mp4 = {
|
||||
icon = "",
|
||||
color = colors.mp4,
|
||||
name = "mp4",
|
||||
},
|
||||
out = {
|
||||
icon = "",
|
||||
color = colors.out,
|
||||
name = "out",
|
||||
},
|
||||
py = {
|
||||
icon = "",
|
||||
color = colors.py,
|
||||
name = "py",
|
||||
},
|
||||
["robots.txt"] = {
|
||||
icon = "ﮧ",
|
||||
color = colors.robot,
|
||||
name = "robots",
|
||||
},
|
||||
toml = {
|
||||
icon = "",
|
||||
color = colors.toml,
|
||||
name = "toml",
|
||||
},
|
||||
ts = {
|
||||
icon = "",
|
||||
color = colors.ts,
|
||||
name = "ts",
|
||||
},
|
||||
ttf = {
|
||||
icon = "",
|
||||
color = colors.ttf,
|
||||
name = "TrueTypeFont",
|
||||
},
|
||||
rb = {
|
||||
icon = "",
|
||||
color = colors.rb,
|
||||
name = "rb",
|
||||
},
|
||||
rpm = {
|
||||
icon = "",
|
||||
color = colors.rpm,
|
||||
name = "rpm",
|
||||
},
|
||||
vue = {
|
||||
icon = "﵂",
|
||||
color = colors.vue,
|
||||
name = "vue",
|
||||
},
|
||||
woff = {
|
||||
icon = "",
|
||||
color = colors.woff,
|
||||
name = "WebOpenFontFormat",
|
||||
},
|
||||
woff2 = {
|
||||
icon = "",
|
||||
color = colors.woff2,
|
||||
name = "WebOpenFontFormat2",
|
||||
},
|
||||
xz = {
|
||||
icon = "",
|
||||
color = colors.zip,
|
||||
name = "xz",
|
||||
},
|
||||
zip = {
|
||||
icon = "",
|
||||
color = colors.zip,
|
||||
name = "zip",
|
||||
},
|
||||
jsx = {
|
||||
icon = "ﰆ",
|
||||
color = colors.jsx,
|
||||
name = "jsx",
|
||||
},
|
||||
rust = {
|
||||
icon = "",
|
||||
color = colors.rs,
|
||||
name = "rs",
|
||||
},
|
||||
jpg = {
|
||||
icon = "",
|
||||
color = colors.jpg,
|
||||
name = "jpg",
|
||||
},
|
||||
png = {
|
||||
icon = "",
|
||||
color = colors.png,
|
||||
name = "png",
|
||||
},
|
||||
jpeg = {
|
||||
icon = "",
|
||||
color = colors.jpeg,
|
||||
name = "jpeg",
|
||||
},
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
@ -17,3 +17,12 @@ map("n", "<C-Down>", "<cmd>resize +2<CR>", opts)
|
||||
map("n", "<C-Left>", "<cmd>vertical resize -2<CR>", opts)
|
||||
map("n", "<C-Right>", "<cmd>vertical resize +2<CR>", opts)
|
||||
|
||||
-- Navigate buffers with S-lh
|
||||
map("n", "<S-l>", "<cmd>bnext<CR>", opts)
|
||||
map("n", "<S-h>", "<cmd>bprevious<CR>", opts)
|
||||
|
||||
-- NvimTree
|
||||
map('n', '<leader>e', '<cmd>NvimTreeToggle<CR>', opts)
|
||||
map('n', '<leader>o', '<cmd>NvimTreeFocus<CR>', opts)
|
||||
|
||||
|
||||
|
||||
@ -22,6 +22,10 @@ packer.startup {
|
||||
use { 'nathom/filetype.nvim', config = function() vim.g.did_load_filetypes = 1 end }
|
||||
|
||||
-- General Assets/Resources
|
||||
-- TODO: Currently, you have to run :PackerSync in order to get the colors working...
|
||||
-- Actually was :PackerCompile.
|
||||
-- This makes me think there was just a dependency problem somewhere here...
|
||||
-- Now, the config may be bjorked
|
||||
use { 'kyazdani42/nvim-web-devicons', config = function() require'configs.icons'.config() end }
|
||||
|
||||
--
|
||||
@ -35,7 +39,9 @@ packer.startup {
|
||||
use { 'moll/vim-bbye' } -- Close buffers softly
|
||||
use {
|
||||
'akinsho/bufferline.nvim',
|
||||
after = 'nvim-web-devicons',
|
||||
requires = {
|
||||
{ 'kyazdani42/nvim-web-devicons' }
|
||||
},
|
||||
config = function() require'configs.bufferline'.config() end
|
||||
}
|
||||
|
||||
@ -49,7 +55,9 @@ packer.startup {
|
||||
-- NvimTree
|
||||
use {
|
||||
'kyazdani42/nvim-tree.lua',
|
||||
after = 'nvim-web-devicons',
|
||||
requires = {
|
||||
{ 'kyazdani42/nvim-web-devicons' }
|
||||
},
|
||||
config = function() require'configs.nvim-tree'.config() end
|
||||
}
|
||||
|
||||
|
||||
@ -1,214 +0,0 @@
|
||||
-- Automatically generated packer.nvim plugin loader code
|
||||
|
||||
if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
|
||||
vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
|
||||
return
|
||||
end
|
||||
|
||||
vim.api.nvim_command('packadd packer.nvim')
|
||||
|
||||
local no_errors, error_msg = pcall(function()
|
||||
|
||||
local time
|
||||
local profile_info
|
||||
local should_profile = false
|
||||
if should_profile then
|
||||
local hrtime = vim.loop.hrtime
|
||||
profile_info = {}
|
||||
time = function(chunk, start)
|
||||
if start then
|
||||
profile_info[chunk] = hrtime()
|
||||
else
|
||||
profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
|
||||
end
|
||||
end
|
||||
else
|
||||
time = function(chunk, start) end
|
||||
end
|
||||
|
||||
local function save_profiles(threshold)
|
||||
local sorted_times = {}
|
||||
for chunk_name, time_taken in pairs(profile_info) do
|
||||
sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
|
||||
end
|
||||
table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
|
||||
local results = {}
|
||||
for i, elem in ipairs(sorted_times) do
|
||||
if not threshold or threshold and elem[2] > threshold then
|
||||
results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
|
||||
end
|
||||
end
|
||||
|
||||
_G._packer = _G._packer or {}
|
||||
_G._packer.profile_output = results
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], true)
|
||||
local package_path_str = "/home/michael/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/michael/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/michael/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/michael/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||
local install_cpath_pattern = "/home/michael/.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
|
||||
|
||||
if not string.find(package.cpath, install_cpath_pattern, 1, true) then
|
||||
package.cpath = package.cpath .. ';' .. install_cpath_pattern
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], false)
|
||||
time([[try_loadstring definition]], true)
|
||||
local function try_loadstring(s, component, name)
|
||||
local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
|
||||
if not success then
|
||||
vim.schedule(function()
|
||||
vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
|
||||
end)
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
time([[try_loadstring definition]], false)
|
||||
time([[Defining packer_plugins]], true)
|
||||
_G.packer_plugins = {
|
||||
["bufferline.nvim"] = {
|
||||
config = { "\27LJ\2\nA\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\vconfig\23configs.bufferline\frequire\0" },
|
||||
load_after = {},
|
||||
loaded = true,
|
||||
needs_bufread = false,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/opt/bufferline.nvim",
|
||||
url = "https://github.com/akinsho/bufferline.nvim"
|
||||
},
|
||||
["darkplus.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/darkplus.nvim",
|
||||
url = "https://github.com/lunarvim/darkplus.nvim"
|
||||
},
|
||||
["filetype.nvim"] = {
|
||||
config = { "\27LJ\2\n4\0\0\2\0\3\0\0056\0\0\0009\0\1\0)\1\1\0=\1\2\0K\0\1\0\23did_load_filetypes\6g\bvim\0" },
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/filetype.nvim",
|
||||
url = "https://github.com/nathom/filetype.nvim"
|
||||
},
|
||||
["impatient.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/impatient.nvim",
|
||||
url = "https://github.com/lewis6991/impatient.nvim"
|
||||
},
|
||||
["lualine.nvim"] = {
|
||||
config = { "\27LJ\2\n>\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\vconfig\20configs.lualine\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/lualine.nvim",
|
||||
url = "https://github.com/nvim-lualine/lualine.nvim"
|
||||
},
|
||||
["nvim-colorizer.lua"] = {
|
||||
config = { "\27LJ\2\n@\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\vconfig\22configs.colorizer\frequire\0" },
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
|
||||
url = "https://github.com/norcalli/nvim-colorizer.lua"
|
||||
},
|
||||
["nvim-tree.lua"] = {
|
||||
config = { "\27LJ\2\n@\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\vconfig\22configs.nvim-tree\frequire\0" },
|
||||
load_after = {},
|
||||
loaded = true,
|
||||
needs_bufread = false,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/opt/nvim-tree.lua",
|
||||
url = "https://github.com/kyazdani42/nvim-tree.lua"
|
||||
},
|
||||
["nvim-treesitter"] = {
|
||||
after = { "nvim-ts-autotag", "nvim-ts-context-commentstring" },
|
||||
config = { "\27LJ\2\nA\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\vconfig\23configs.treesitter\frequire\0" },
|
||||
loaded = false,
|
||||
needs_bufread = true,
|
||||
only_cond = false,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/opt/nvim-treesitter",
|
||||
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
["nvim-ts-autotag"] = {
|
||||
load_after = {
|
||||
["nvim-treesitter"] = true
|
||||
},
|
||||
loaded = false,
|
||||
needs_bufread = false,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/opt/nvim-ts-autotag",
|
||||
url = "https://github.com/windwp/nvim-ts-autotag"
|
||||
},
|
||||
["nvim-ts-context-commentstring"] = {
|
||||
load_after = {
|
||||
["nvim-treesitter"] = true
|
||||
},
|
||||
loaded = false,
|
||||
needs_bufread = false,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/opt/nvim-ts-context-commentstring",
|
||||
url = "https://github.com/JoosepAlviste/nvim-ts-context-commentstring"
|
||||
},
|
||||
["nvim-web-devicons"] = {
|
||||
after = { "nvim-tree.lua", "bufferline.nvim" },
|
||||
loaded = true,
|
||||
only_config = true
|
||||
},
|
||||
["plenary.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||
url = "https://github.com/nvim-lua/plenary.nvim"
|
||||
},
|
||||
["popup.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/popup.nvim",
|
||||
url = "https://github.com/nvim-lua/popup.nvim"
|
||||
},
|
||||
["vim-bbye"] = {
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/vim-bbye",
|
||||
url = "https://github.com/moll/vim-bbye"
|
||||
},
|
||||
["vim-lastplace"] = {
|
||||
loaded = true,
|
||||
path = "/home/michael/.local/share/nvim/site/pack/packer/start/vim-lastplace",
|
||||
url = "https://github.com/farmergreg/vim-lastplace"
|
||||
}
|
||||
}
|
||||
|
||||
time([[Defining packer_plugins]], false)
|
||||
-- Config for: nvim-web-devicons
|
||||
time([[Config for nvim-web-devicons]], true)
|
||||
try_loadstring("\27LJ\2\n<\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\vconfig\18configs.icons\frequire\0", "config", "nvim-web-devicons")
|
||||
time([[Config for nvim-web-devicons]], false)
|
||||
-- Config for: lualine.nvim
|
||||
time([[Config for lualine.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n>\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\vconfig\20configs.lualine\frequire\0", "config", "lualine.nvim")
|
||||
time([[Config for lualine.nvim]], false)
|
||||
-- Config for: nvim-colorizer.lua
|
||||
time([[Config for nvim-colorizer.lua]], true)
|
||||
try_loadstring("\27LJ\2\n@\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\vconfig\22configs.colorizer\frequire\0", "config", "nvim-colorizer.lua")
|
||||
time([[Config for nvim-colorizer.lua]], false)
|
||||
-- Config for: filetype.nvim
|
||||
time([[Config for filetype.nvim]], true)
|
||||
try_loadstring("\27LJ\2\n4\0\0\2\0\3\0\0056\0\0\0009\0\1\0)\1\1\0=\1\2\0K\0\1\0\23did_load_filetypes\6g\bvim\0", "config", "filetype.nvim")
|
||||
time([[Config for filetype.nvim]], false)
|
||||
-- Load plugins in order defined by `after`
|
||||
time([[Sequenced loading]], true)
|
||||
vim.cmd [[ packadd nvim-tree.lua ]]
|
||||
|
||||
-- Config for: nvim-tree.lua
|
||||
try_loadstring("\27LJ\2\n@\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\vconfig\22configs.nvim-tree\frequire\0", "config", "nvim-tree.lua")
|
||||
|
||||
vim.cmd [[ packadd bufferline.nvim ]]
|
||||
|
||||
-- Config for: bufferline.nvim
|
||||
try_loadstring("\27LJ\2\nA\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\vconfig\23configs.bufferline\frequire\0", "config", "bufferline.nvim")
|
||||
|
||||
time([[Sequenced loading]], false)
|
||||
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")({'nvim-treesitter'}, { event = "BufRead *" }, _G.packer_plugins)]]
|
||||
time([[Defining lazy-load event autocommands]], false)
|
||||
vim.cmd("augroup END")
|
||||
if should_profile then save_profiles() end
|
||||
|
||||
end)
|
||||
|
||||
if not no_errors then
|
||||
error_msg = error_msg:gsub('"', '\\"')
|
||||
vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
|
||||
end
|
||||
Loading…
Reference in New Issue
Block a user