diff --git a/init.lua b/init.lua index 51a1e89..0c02f80 100755 --- a/init.lua +++ b/init.lua @@ -6,7 +6,9 @@ require('plugins/nvim-tree') require('plugins/indent-blankline') require('plugins/feline') require('plugins/vista') ---require('plugins/nvim-cmp') +require('plugins/headlines') +require('plugins/nvim-cmp') +require('plugins/nvim-lspconfig') require('plugins/prettier') require('plugins/nvim-treesitter') require('plugins/alpha-nvim') @@ -14,5 +16,4 @@ require('plugins/symbols-outline') require('plugins/nvim-lsp-installer') require('plugins/neoscroll') require('plugins/marks') -require('plugins/toggleterm') require('plugins/null-ls') diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index b40936d..884bdeb 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -107,16 +107,6 @@ return require'packer'.startup(function() {'nvim-lua/plenary.nvim'}, } } - -- Terminal Integration - use {"akinsho/toggleterm.nvim", - tag = 'v1.*', - config = function() - require('toggleterm').setup({ - shell = '/usr/bin/local/zsh', - }) - end, - } - use { 'feline-nvim/feline.nvim', requires = { 'kyazdani42/nvim-web-devicons' }, diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua deleted file mode 100644 index 81965ed..0000000 --- a/lua/plugins/toggleterm.lua +++ /dev/null @@ -1,36 +0,0 @@ -local status_ok, toggleterm = pcall(require, "toggleterm") -if not status_ok then - return -end - -toggleterm.setup({ - size = 10, - open_mapping = [[]], - hide_numbers = true, - shade_filetypes = {}, - shade_terminals = true, - shading_factor = 1, - start_in_insert = true, - insert_mappings = true, - persist_size = true, - direction = "horizontal", - close_on_exit = true, - shell = vim.o.shell, -}) - -function _G.set_terminal_keymaps() - local opts = {noremap = true} - vim.api.nvim_buf_set_keymap(0, 't', '', [[]], opts) - vim.api.nvim_buf_set_keymap(0, 't', 'jk', [[]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[h]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[j]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[k]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[l]], opts) -end - -vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') -vim.cmd('set shell=zsh') - - -local Terminal = require("toggleterm.terminal").Terminal -local node = Terminal:new({ cmd = "node", hidden = true }) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index d033efd..436001d 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -72,259 +72,255 @@ _G.packer_plugins = { LuaSnip = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip.git" + url = "https://github.com/L3MON4D3/LuaSnip" }, ["alpha-nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/alpha-nvim", - url = "https://github.com/goolord/alpha-nvim.git" + url = "https://github.com/goolord/alpha-nvim" }, ["cheatsheet.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cheatsheet.nvim", - url = "https://github.com/sudormrfbin/cheatsheet.nvim.git" + url = "https://github.com/sudormrfbin/cheatsheet.nvim" }, ["cmp-buffer"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-buffer", - url = "https://github.com/hrsh7th/cmp-buffer.git" + url = "https://github.com/hrsh7th/cmp-buffer" }, ["cmp-calc"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-calc", - url = "https://github.com/hrsh7th/cmp-calc.git" + url = "https://github.com/hrsh7th/cmp-calc" }, ["cmp-emoji"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-emoji", - url = "https://github.com/hrsh7th/cmp-emoji.git" + url = "https://github.com/hrsh7th/cmp-emoji" }, ["cmp-look"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-look", - url = "https://github.com/hrsh7th/cmp-look.git" + url = "https://github.com/hrsh7th/cmp-look" }, ["cmp-nvim-lsp"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp.git" + url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, ["cmp-nvim-ultisnips"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-nvim-ultisnips", - url = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips.git" + url = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips" }, ["cmp-path"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-path", - url = "https://github.com/hrsh7th/cmp-path.git" + url = "https://github.com/hrsh7th/cmp-path" }, ["cmp-spell"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-spell", - url = "https://github.com/f3fora/cmp-spell.git" + url = "https://github.com/f3fora/cmp-spell" }, ["cmp-tabnine"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-tabnine", - url = "https://github.com/tzachar/cmp-tabnine.git" + url = "https://github.com/tzachar/cmp-tabnine" }, cmp_luasnip = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp_luasnip", - url = "https://github.com/saadparwaiz1/cmp_luasnip.git" + url = "https://github.com/saadparwaiz1/cmp_luasnip" }, ["colorbuddy.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/colorbuddy.nvim", - url = "https://github.com/tjdevries/colorbuddy.nvim.git" + url = "https://github.com/tjdevries/colorbuddy.nvim" }, colorschemes = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/colorschemes", - url = "https://github.com/lunarvim/colorschemes.git" + url = "https://github.com/lunarvim/colorschemes" }, ["dracula.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/dracula.nvim", - url = "https://github.com/Mofiqul/dracula.nvim.git" + url = "https://github.com/Mofiqul/dracula.nvim" }, ["feline.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/feline.nvim", - url = "https://github.com/feline-nvim/feline.nvim.git" + url = "https://github.com/feline-nvim/feline.nvim" }, ["follow-md-links.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/follow-md-links.nvim", - url = "https://github.com/jghauser/follow-md-links.nvim.git" + url = "https://github.com/jghauser/follow-md-links.nvim" }, ["gitsigns.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", - url = "https://github.com/lewis6991/gitsigns.nvim.git" + url = "https://github.com/lewis6991/gitsigns.nvim" }, gloombuddy = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/gloombuddy", - url = "https://github.com/bkegley/gloombuddy.git" + url = "https://github.com/bkegley/gloombuddy" }, ["glow.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/glow.nvim", - url = "https://github.com/ellisonleao/glow.nvim.git" + url = "https://github.com/ellisonleao/glow.nvim" }, ["headlines.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/headlines.nvim", - url = "https://github.com/lukas-reineke/headlines.nvim.git" + url = "https://github.com/lukas-reineke/headlines.nvim" }, ["indent-blankline.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", - url = "https://github.com/lukas-reineke/indent-blankline.nvim.git" + url = "https://github.com/lukas-reineke/indent-blankline.nvim" }, ["markdown-preview.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim", - url = "https://github.com/iamcco/markdown-preview.nvim.git" + url = "https://github.com/iamcco/markdown-preview.nvim" }, ["marks.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/marks.nvim", - url = "https://github.com/chentoast/marks.nvim.git" + url = "https://github.com/chentoast/marks.nvim" }, ["mkdnflow.nvim"] = { config = { "\27LJ\2\nÉ\2\0\0\6\0\21\0\0296\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\19\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\3=\3\20\2B\0\2\1K\0\1\0\rmappings\1\0\0\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0" }, loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/mkdnflow.nvim", - url = "https://github.com/jakewvincent/mkdnflow.nvim.git" + url = "https://github.com/jakewvincent/mkdnflow.nvim" }, ["monokai.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/monokai.nvim", - url = "https://github.com/tanvirtin/monokai.nvim.git" + url = "https://github.com/tanvirtin/monokai.nvim" }, ["neoscroll.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/neoscroll.nvim", - url = "https://github.com/karb94/neoscroll.nvim.git" + url = "https://github.com/karb94/neoscroll.nvim" }, ["null-ls.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/null-ls.nvim", - url = "https://github.com/jose-elias-alvarez/null-ls.nvim.git" + url = "https://github.com/jose-elias-alvarez/null-ls.nvim" }, ["nvim-autopairs"] = { 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\nsetup\19nvim-autopairs\frequire\0" }, loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-autopairs", - url = "https://github.com/windwp/nvim-autopairs.git" + url = "https://github.com/windwp/nvim-autopairs" }, ["nvim-cmp"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp.git" + url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-lsp-installer"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", - url = "https://github.com/williamboman/nvim-lsp-installer.git" + url = "https://github.com/williamboman/nvim-lsp-installer" }, ["nvim-lspconfig"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig.git" + url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-tree.lua"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-tree.lua", - url = "https://github.com/kyazdani42/nvim-tree.lua.git" + url = "https://github.com/kyazdani42/nvim-tree.lua" }, ["nvim-treesitter"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter.git" + url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", - url = "https://github.com/kyazdani42/nvim-web-devicons.git" + url = "https://github.com/kyazdani42/nvim-web-devicons" }, ["packer.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim.git" + url = "https://github.com/wbthomason/packer.nvim" }, ["plenary.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim.git" + url = "https://github.com/nvim-lua/plenary.nvim" }, ["popup.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/popup.nvim", - url = "https://github.com/nvim-lua/popup.nvim.git" + url = "https://github.com/nvim-lua/popup.nvim" }, ["prettier.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/prettier.nvim", - url = "https://github.com/MunifTanjim/prettier.nvim.git" + url = "https://github.com/MunifTanjim/prettier.nvim" }, ["rose-pine"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/rose-pine", - url = "https://github.com/rose-pine/neovim.git" + url = "https://github.com/rose-pine/neovim" }, ["symbols-outline.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim", - url = "https://github.com/simrat39/symbols-outline.nvim.git" + url = "https://github.com/simrat39/symbols-outline.nvim" }, ["toggleterm.nvim"] = { config = { "\27LJ\2\nX\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\nshell\23/usr/bin/local/zsh\nsetup\15toggleterm\frequire\0" }, loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/toggleterm.nvim", - url = "https://github.com/akinsho/toggleterm.nvim.git" + url = "https://github.com/akinsho/toggleterm.nvim" }, ["tokyonight.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/tokyonight.nvim", - url = "https://github.com/folke/tokyonight.nvim.git" + url = "https://github.com/folke/tokyonight.nvim" }, ["trouble.nvim"] = { config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0" }, loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/trouble.nvim", - url = "https://github.com/folke/trouble.nvim.git" + url = "https://github.com/folke/trouble.nvim" }, ["vem-tabline"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/vem-tabline", - url = "https://github.com/pacha/vem-tabline.git" + url = "https://github.com/pacha/vem-tabline" }, ["vim-tmux-navigator"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator", - url = "https://github.com/christoomey/vim-tmux-navigator.git" + url = "https://github.com/christoomey/vim-tmux-navigator" }, ["vim-wakatime"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/vim-wakatime", - url = "https://github.com/wakatime/vim-wakatime.git" + url = "https://github.com/wakatime/vim-wakatime" }, ["vista.vim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/vista.vim", - url = "https://github.com/liuchengxu/vista.vim.git" + url = "https://github.com/liuchengxu/vista.vim" } } time([[Defining packer_plugins]], false) --- Config for: mkdnflow.nvim -time([[Config for mkdnflow.nvim]], true) -try_loadstring("\27LJ\2\nÉ\2\0\0\6\0\21\0\0296\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\19\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\3=\3\20\2B\0\2\1K\0\1\0\rmappings\1\0\0\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") -time([[Config for mkdnflow.nvim]], false) -- Config for: toggleterm.nvim time([[Config for toggleterm.nvim]], true) try_loadstring("\27LJ\2\nX\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\nshell\23/usr/bin/local/zsh\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim") @@ -333,6 +329,10 @@ time([[Config for toggleterm.nvim]], false) time([[Config for nvim-autopairs]], 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\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") time([[Config for nvim-autopairs]], false) +-- Config for: mkdnflow.nvim +time([[Config for mkdnflow.nvim]], true) +try_loadstring("\27LJ\2\nÉ\2\0\0\6\0\21\0\0296\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\19\0005\3\5\0005\4\4\0005\5\3\0>\5\1\4=\4\6\0035\4\b\0005\5\a\0>\5\1\4=\4\t\0035\4\v\0005\5\n\0>\5\1\4=\4\f\0035\4\14\0005\5\r\0>\5\1\4=\4\15\0035\4\17\0005\5\16\0>\5\1\4=\4\18\3=\3\20\2B\0\2\1K\0\1\0\rmappings\1\0\0\rMkdnSTab\1\3\0\0\0\f\1\2\0\0\6i\fMkdnTab\1\3\0\0\0\n\1\2\0\0\6i\14MkdnEnter\1\3\0\0\0\t\1\2\0\0\6n\20MkdnNewListItem\1\3\0\0\0\t\1\2\0\0\6i\19MkdnToggleToDo\1\0\1\22MkdnTableNextCell\1\1\3\0\0\0\14\1\3\0\0\6i\6n\nsetup\rmkdnflow\frequire\0", "config", "mkdnflow.nvim") +time([[Config for mkdnflow.nvim]], false) -- Config for: trouble.nvim time([[Config for trouble.nvim]], true) try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim")