diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore index c84aa4a..651614d 100644 --- a/.config/nvim/.gitignore +++ b/.config/nvim/.gitignore @@ -1 +1,3 @@ +lua/plugins.lua +lua/tangerine_vimrc.lua plugin/packer_compiled.lua diff --git a/.config/nvim/.luarc.json b/.config/nvim/.luarc.json index e34fdba..0b62dde 100644 --- a/.config/nvim/.luarc.json +++ b/.config/nvim/.luarc.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", "Lua.diagnostics.globals": [ "vim", - "use" + "use", + "packer_bootstrap" ] } \ No newline at end of file diff --git a/.config/nvim/fnl/plugins.fnl b/.config/nvim/fnl/plugins.fnl new file mode 100644 index 0000000..494a232 --- /dev/null +++ b/.config/nvim/fnl/plugins.fnl @@ -0,0 +1,74 @@ +(import-macros {: packer : packer-setup : use!} :hibiscus.packer) + +(packer-setup) + +(packer + (use! "~/.config/nvim/themes/solarized.nvim") + + (use! :nvim-lua/popup.nvim) + + (use! :nvim-treesitter/nvim-treesitter + :run ":TSUpdate") + + (use! :feline-nvim/feline.nvim + :requires :kyazdani42/nvim-web-devicons) + + (use! :williamboman/mason.nvim + :requires [ + :williamboman/mason-lspconfig.nvim + :neovim/nvim-lspconfig + ]) + + (use! :nvim-neo-tree/neo-tree.nvim + :branch "v2.x" + :requires [ + :nvim-lua/plenary.nvim + :kyazdani42/nvim-web-devicons + :MunifTanjim/nui.nvim + :s1n7ax/nvim-window-picker + ]) + + (use! :mrjones2014/smart-splits.nvim) + + (use! :famiu/bufdelete.nvim) + + (use! :akinsho/bufferline.nvim + :tag "v2.*" + :requires :kyazdani42/nvim-web-devicons) + + (use! :windwp/nvim-autopairs) + + (use! :lewis6991/gitsigns.nvim) + + (use! :declancm/cinnamon.nvim) + + (use! :stevearc/aerial.nvim) + + (use! :nmac427/guess-indent.nvim) + + (use! :nvim-telescope/telescope.nvim + :requires :nvim-lua/plenary.nvim) + + (use! :sindrets/diffview.nvim + :requires :nvim-lua/plenary.nvim) + + (use! :hrsh7th/nvim-cmp + :requires [ + :hrsh7th/cmp-omni + :hrsh7th/cmp-nvim-lsp + :onsails/lspkind.nvim + ]) + + (use! :jose-elias-alvarez/null-ls.nvim) + + (use! :L3MON4D3/LuaSnip + :requires [ + :saadparwaiz1/cmp_luasnip + :rafamadriz/friendly-snippets + ]) + + (use! :lervag/vimtex) + + (use! :udayvir-singh/tangerine.nvim) + (use! :udayvir-singh/hibiscus.nvim) +) diff --git a/.config/nvim/init.fnl b/.config/nvim/init.fnl new file mode 100644 index 0000000..12b6bc6 --- /dev/null +++ b/.config/nvim/init.fnl @@ -0,0 +1 @@ +(require :plugins) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8a94616..887973d 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,9 +1,3 @@ -require 'bootstrap' - - -require 'plugins' - - require 'popup' diff --git a/.config/nvim/lua/bootstrap.lua b/.config/nvim/lua/bootstrap.lua deleted file mode 100644 index 0ceeed0..0000000 --- a/.config/nvim/lua/bootstrap.lua +++ /dev/null @@ -1,6 +0,0 @@ -local fn = vim.fn -local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' -if fn.empty(fn.glob(install_path)) > 0 then - Packer_Bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - vim.cmd [[packadd packer.nvim]] -end diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua deleted file mode 100644 index db4242e..0000000 --- a/.config/nvim/lua/plugins.lua +++ /dev/null @@ -1,72 +0,0 @@ -return require('packer').startup(function() - use '~/.config/nvim/themes/solarized.nvim' - - use 'wbthomason/packer.nvim' - - use 'nvim-lua/popup.nvim' - - use { - 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate' - } - - use {'feline-nvim/feline.nvim', requires = 'kyazdani42/nvim-web-devicons'} - - use { - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", - "neovim/nvim-lspconfig", - } - - use { - "nvim-neo-tree/neo-tree.nvim", - branch = "v2.x", - requires = { - "nvim-lua/plenary.nvim", - "kyazdani42/nvim-web-devicons", - "MunifTanjim/nui.nvim", - 's1n7ax/nvim-window-picker' - } - } - - use 'mrjones2014/smart-splits.nvim' - - use 'famiu/bufdelete.nvim' - - use {'akinsho/bufferline.nvim', tag = "v2.*", requires = 'kyazdani42/nvim-web-devicons'} - - use 'windwp/nvim-autopairs' - - use 'lewis6991/gitsigns.nvim' - - use 'declancm/cinnamon.nvim' - - use 'stevearc/aerial.nvim' - - use 'nmac427/guess-indent.nvim' - - use {'nvim-telescope/telescope.nvim', requires = 'nvim-lua/plenary.nvim'} - - use { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' } - - use { - 'hrsh7th/nvim-cmp', - 'hrsh7th/cmp-omni', - 'hrsh7th/cmp-nvim-lsp', - 'onsails/lspkind.nvim' - } - - use 'jose-elias-alvarez/null-ls.nvim' - - use { - 'L3MON4D3/LuaSnip', - 'saadparwaiz1/cmp_luasnip', - 'rafamadriz/friendly-snippets' - } - - use 'lervag/vimtex' - - if Packer_Bootstrap then - require('packer').sync() - end -end) diff --git a/.config/nvim/plugin/bootstrap.lua b/.config/nvim/plugin/bootstrap.lua new file mode 100644 index 0000000..2af9c8d --- /dev/null +++ b/.config/nvim/plugin/bootstrap.lua @@ -0,0 +1,19 @@ +local install_path = vim.fn.stdpath('data')..'/site/pack/packer/start/' + +local function bootstrap(url) + local name = url:gsub('.*/', '') + local path = install_path .. name + if vim.fn.empty(vim.fn.glob(path)) > 0 then + vim.fn.system({'git', 'clone', '--depth', '1', url, path}) + vim.cmd('packadd ' .. name) + end +end + +bootstrap('https://github.com/udayvir-singh/tangerine.nvim') +bootstrap('https://github.com/udayvir-singh/hibiscus.nvim') + +require('tangerine').setup({ + compiler = { + hooks = {'oninit'} + } +})