diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c84aa4a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +plugin/packer_compiled.lua diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua index 41f0512..118c635 100644 --- a/after/plugin/fugitive.lua +++ b/after/plugin/fugitive.lua @@ -1,10 +1,10 @@ vim.keymap.set("n", "gs", vim.cmd.Git) -local ThePrimeagen_Fugitive = vim.api.nvim_create_augroup("ThePrimeagen_Fugitive", {}) +local default_Fugitive = vim.api.nvim_create_augroup("default_Fugitive", {}) local autocmd = vim.api.nvim_create_autocmd autocmd("BufWinEnter", { - group = ThePrimeagen_Fugitive, + group = default_Fugitive, pattern = "*", callback = function() if vim.bo.ft ~= "fugitive" then diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua deleted file mode 100644 index 4a6ba87..0000000 --- a/after/plugin/harpoon.lua +++ /dev/null @@ -1,12 +0,0 @@ -local mark = require("harpoon.mark") -local ui = require("harpoon.ui") - -vim.keymap.set("n", "a", mark.add_file) -vim.keymap.set("n", "", ui.toggle_quick_menu) - -vim.keymap.set("n", "", function() ui.nav_file(1) end) -vim.keymap.set("n", "", function() ui.nav_file(2) end) -vim.keymap.set("n", "", function() ui.nav_file(3) end) -vim.keymap.set("n", "", function() ui.nav_file(4) end) - - diff --git a/after/plugin/refactoring.lua b/after/plugin/refactoring.lua deleted file mode 100644 index 2f9f70c..0000000 --- a/after/plugin/refactoring.lua +++ /dev/null @@ -1,5 +0,0 @@ -require('refactoring').setup({}) - -vim.api.nvim_set_keymap("v", "ri", [[ lua require('refactoring').refactor('Inline Variable')]], {noremap = true, silent = true, expr = false}) - - diff --git a/init.lua b/init.lua index a39d9f1..4368918 100644 --- a/init.lua +++ b/init.lua @@ -1,2 +1,2 @@ -require("theprimeagen") +require("default") diff --git a/lua/theprimeagen/init.lua b/lua/default/init.lua similarity index 80% rename from lua/theprimeagen/init.lua rename to lua/default/init.lua index eda3d18..ae02b81 100644 --- a/lua/theprimeagen/init.lua +++ b/lua/default/init.lua @@ -1,8 +1,8 @@ -require("theprimeagen.set") -require("theprimeagen.remap") +require("default.set") +require("default.remap") local augroup = vim.api.nvim_create_augroup -local ThePrimeagenGroup = augroup('ThePrimeagen', {}) +local default_group = augroup('Default', {}) local autocmd = vim.api.nvim_create_autocmd local yank_group = augroup('HighlightYank', {}) @@ -23,7 +23,7 @@ autocmd('TextYankPost', { }) autocmd({"BufWritePre"}, { - group = ThePrimeagenGroup, + group = default_group, pattern = "*", command = [[%s/\s\+$//e]], }) diff --git a/lua/theprimeagen/packer.lua b/lua/default/packer.lua similarity index 87% rename from lua/theprimeagen/packer.lua rename to lua/default/packer.lua index 96f7c6e..0d98e28 100644 --- a/lua/theprimeagen/packer.lua +++ b/lua/default/packer.lua @@ -21,14 +21,13 @@ return require('packer').startup(function(use) end }) + use('vuciv/vim-bujo') + use({ "folke/trouble.nvim", config = function() require("trouble").setup { icons = false, - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below } end }) @@ -40,8 +39,6 @@ return require('packer').startup(function(use) ts_update() end,} use("nvim-treesitter/playground") - use("theprimeagen/harpoon") - use("theprimeagen/refactoring.nvim") use("mbbill/undotree") use("tpope/vim-fugitive") use("nvim-treesitter/nvim-treesitter-context"); diff --git a/lua/theprimeagen/remap.lua b/lua/default/remap.lua similarity index 77% rename from lua/theprimeagen/remap.lua rename to lua/default/remap.lua index e165d1a..31f7ce2 100644 --- a/lua/theprimeagen/remap.lua +++ b/lua/default/remap.lua @@ -11,13 +11,6 @@ vim.keymap.set("n", "", "zz") vim.keymap.set("n", "n", "nzzzv") vim.keymap.set("n", "N", "Nzzzv") -vim.keymap.set("n", "vwm", function() - require("vim-with-me").StartVimWithMe() -end) -vim.keymap.set("n", "svwm", function() - require("vim-with-me").StopVimWithMe() -end) - -- greatest remap ever vim.keymap.set("x", "p", [["_dP]]) @@ -42,9 +35,6 @@ vim.keymap.set("n", "j", "lprevzz") vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) -vim.keymap.set("n", "vpp", "e ~/.dotfiles/nvim/.config/nvim/lua/theprimeagen/packer.lua"); -vim.keymap.set("n", "mr", "CellularAutomaton make_it_rain"); - vim.keymap.set("n", "", function() vim.cmd("so") end) diff --git a/lua/theprimeagen/set.lua b/lua/default/set.lua similarity index 100% rename from lua/theprimeagen/set.lua rename to lua/default/set.lua diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua deleted file mode 100644 index 4f62e10..0000000 --- a/plugin/packer_compiled.lua +++ /dev/null @@ -1,244 +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() - -_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 = "/home/slasbrugnas/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/slasbrugnas/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/slasbrugnas/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/slasbrugnas/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/slasbrugnas/.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 = { - LuaSnip = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["cellular-automaton.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/cellular-automaton.nvim", - url = "https://github.com/eandrju/cellular-automaton.nvim" - }, - ["cloak.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/cloak.nvim", - url = "https://github.com/laytan/cloak.nvim" - }, - ["cmp-buffer"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["cmp-nvim-lua"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", - url = "https://github.com/hrsh7th/cmp-nvim-lua" - }, - ["cmp-path"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/cmp-path", - url = "https://github.com/hrsh7th/cmp-path" - }, - cmp_luasnip = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/cmp_luasnip", - url = "https://github.com/saadparwaiz1/cmp_luasnip" - }, - ["copilot.vim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/copilot.vim", - url = "https://github.com/github/copilot.vim" - }, - ["friendly-snippets"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/friendly-snippets", - url = "https://github.com/rafamadriz/friendly-snippets" - }, - harpoon = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/harpoon", - url = "https://github.com/theprimeagen/harpoon" - }, - ["lsp-zero.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", - url = "https://github.com/VonHeikemen/lsp-zero.nvim" - }, - ["mason-lspconfig.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", - url = "https://github.com/williamboman/mason-lspconfig.nvim" - }, - ["mason.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/mason.nvim", - url = "https://github.com/williamboman/mason.nvim" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["nvim-treesitter-context"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/nvim-treesitter-context", - url = "https://github.com/nvim-treesitter/nvim-treesitter-context" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - playground = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/playground", - url = "https://github.com/nvim-treesitter/playground" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["refactoring.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/refactoring.nvim", - url = "https://github.com/theprimeagen/refactoring.nvim" - }, - ["rose-pine"] = { - config = { "\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0" }, - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/rose-pine", - url = "https://github.com/rose-pine/neovim" - }, - ["telescope.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - ["trouble.nvim"] = { - config = { "\27LJ\2\nC\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nicons\1\nsetup\ftrouble\frequire\0" }, - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/trouble.nvim", - url = "https://github.com/folke/trouble.nvim" - }, - undotree = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/undotree", - url = "https://github.com/mbbill/undotree" - }, - ["vim-fugitive"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/vim-fugitive", - url = "https://github.com/tpope/vim-fugitive" - }, - ["zen-mode.nvim"] = { - loaded = true, - path = "/home/slasbrugnas/.local/share/nvim/site/pack/packer/start/zen-mode.nvim", - url = "https://github.com/folke/zen-mode.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Config for: rose-pine -time([[Config for rose-pine]], true) -try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine") -time([[Config for rose-pine]], false) --- Config for: trouble.nvim -time([[Config for trouble.nvim]], true) -try_loadstring("\27LJ\2\nC\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\1\nicons\1\nsetup\ftrouble\frequire\0", "config", "trouble.nvim") -time([[Config for trouble.nvim]], 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