diff --git a/init.lua b/init.lua index 86565ba..77d69d9 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,4 @@ -- require necessary modules require('macbook.settings') require('macbook.keybindings') +require('macbook.plugins') diff --git a/lua/macbook/plugins.lua b/lua/macbook/plugins.lua new file mode 100644 index 0000000..65ca9d1 --- /dev/null +++ b/lua/macbook/plugins.lua @@ -0,0 +1,49 @@ +-- Automatically run :PackerCompile whenever plugins.lua is updated with an autocommand: + +vim.api.nvim_create_autocmd('BufWritePost', { + group = vim.api.nvim_create_augroup('PACKER', { clear = true }), + pattern = 'plugins.lua', + command = 'source | PackerCompile', +}) + +return require('packer').startup({ + function(use) + --------------------- + -- Package Manager -- + --------------------- + + use('wbthomason/packer.nvim') + + ---------------------- + -- Required plugins -- + ---------------------- + + -- lua functions that you don't want to write twice + use('nvim-lua/plenary.nvim') + + ---------------------------------------- + -- Theme, Icons, Statusbar, Bufferbar -- + ---------------------------------------- + + -- A file type icons + use('nvim-tree/nvim-web-devicons') + + use({ + { + 'nvim-lualine/lualine.nvim', + config = function() + require('macbook.plugins.lualine') + end, + }, + + -- Standalone UI for nvim-lsp progress + { + 'j-hui/fidget.nvim', + after = 'lualine.nvim', + config = function() + require('fidget').setup() + end, + }, + }) + end, +}) diff --git a/lua/macbook/plugins/lualine.lua b/lua/macbook/plugins/lualine.lua new file mode 100644 index 0000000..d34de9d --- /dev/null +++ b/lua/macbook/plugins/lualine.lua @@ -0,0 +1,46 @@ +require('lualine').setup({ + options = { + theme = 'auto', + component_separators = '', + section_separators = '', + icons_enabled = true, + globalstatus = true, + }, + sections = { + lualine_a = { + { 'mode', color = { gui = 'bold' } }, + }, + lualine_b = { + { 'branch' }, + { 'diff', colored = false }, + }, + lualine_c = { + { 'filename', file_status = true }, + { 'diagnostics' }, + }, + lualine_x = { + 'filetype', + 'encoding', + 'fileformat', + }, + lualine_y = { 'progress' }, + lualine_z = { + { 'location', color = { gui = 'bold' } }, + }, + }, + tabline = { + lualine_a = { + { + 'buffers', + buffers_color = { active = 'lualine_b_normal' }, + }, + }, + lualine_z = { + { + 'tabs', + tabs_color = { active = 'lualine_b_normal' }, + }, + }, + }, + extensions = { 'quickfix', 'nvim-tree' }, +}) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua new file mode 100644 index 0000000..092bdc3 --- /dev/null +++ b/plugin/packer_compiled.lua @@ -0,0 +1,137 @@ +-- 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() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +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 + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/Users/siddhartha/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/siddhartha/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/siddhartha/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/siddhartha/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/Users/siddhartha/.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 = { + ["fidget.nvim"] = { + config = { "\27LJ\2\n4\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\vfidget\frequire\0" }, + load_after = {}, + loaded = true, + needs_bufread = false, + path = "/Users/siddhartha/.local/share/nvim/site/pack/packer/opt/fidget.nvim", + url = "https://github.com/j-hui/fidget.nvim" + }, + ["lualine.nvim"] = { + after = { "fidget.nvim" }, + config = { "\27LJ\2\n7\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\28macbook.plugins.lualine\frequire\0" }, + loaded = true, + only_config = true, + path = "/Users/siddhartha/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/Users/siddhartha/.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/siddhartha/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/Users/siddhartha/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) +try_loadstring("\27LJ\2\n7\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\28macbook.plugins.lualine\frequire\0", "config", "lualine.nvim") +time([[Config for lualine.nvim]], false) +-- Load plugins in order defined by `after` +time([[Sequenced loading]], true) +vim.cmd [[ packadd fidget.nvim ]] + +-- Config for: fidget.nvim +try_loadstring("\27LJ\2\n4\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\vfidget\frequire\0", "config", "fidget.nvim") + +time([[Sequenced loading]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +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