1 files changed, 98 insertions, 94 deletions
diff --git a/neovim/.config/nvim/lua/plugins.lua b/neovim/.config/nvim/lua/plugins.lua
index 83afc45..349059a 100644
--- a/neovim/.config/nvim/lua/plugins.lua
+++ b/neovim/.config/nvim/lua/plugins.lua
@@ -1,82 +1,77 @@
-local ensure_packer = function()
-  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
-    fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
-    vim.cmd [[packadd packer.nvim]]
-    return true
-  end
-  return false
-end
-
-local packer_bootstrap = ensure_packer()
-
-return require('packer').startup(function(use)
-  use {
+return {
+  {
     'luisjure/csound-vim',
     ft = 'csound',
-  }
-  use {
+  },
+  {
     'nvimdev/galaxyline.nvim',
     branch = 'main',
-    requires = { { 'nvim-tree/nvim-web-devicons', opt = true } },
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+    },
     config = [[require('config.galaxyline')]],
     after = { 'vim-colors-xcode' },
-  }
-  use {
+  },
+  {
     'lewis6991/gitsigns.nvim',
     config = [[require('config.gitsigns')]],
-  }
-  use {
+  },
+  {
     'junegunn/goyo.vim',
-    cond = function() return vim.fn.exists('g:GtkGuiLoaded') == 1 end,
-    requires = {
+    cond = function() return vim.fn.exists('g:gui_vimr') == 1 end,
+    dependencies = {
       {
         'junegunn/limelight.vim',
-        cond = function() return vim.fn.exists('g:GtkGuiLoaded') == 1 end,
       },
     },
     config = [[require('config.goyo')]],
-  }
-  use {
+  },
+  {
     'lukas-reineke/indent-blankline.nvim',
     config = [[require('config.indent_blankline')]],
-  }
-  use {
+  },
+  {
     'nvimdev/lspsaga.nvim',
     after = { 'nvim-lspconfig' },
-    requires = { { 'nvim-tree/nvim-web-devicons' } },
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+    },
     config = [[require('config.lspsaga')]],
-  }
-  use 'preservim/nerdcommenter'
-	use {
+  },
+  {
+    'preservim/nerdcommenter'
+  },
+	{
 		"nvim-neo-tree/neo-tree.nvim",
     branch = "v3.x",
-    requires = { 
+    dependencies = { 
       "nvim-lua/plenary.nvim",
       "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
       "MunifTanjim/nui.nvim",
       -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
     },
-    setup = function ()
+    init = function ()
       vim.keymap.set('', '<F8>', '<cmd>Neotree toggle<CR>', { noremap = true })
     end
-  }
-  use {
+  },
+  {
     'NeogitOrg/neogit',
     cmd = 'Neogit',
-    requires = { { 'nvim-lua/plenary.nvim' }, { 'sindrets/diffview.nvim' } },
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'sindrets/diffview.nvim',
+    },
     config = [[require('config.neogit')]],
-    setup = function()
+    init = function()
       vim.keymap.set('', '<leader>g', '<cmd>Neogit<CR>', {})
     end,
-  }
-  use {
+  },
+  {
     'hrsh7th/nvim-cmp',
-    requires = {
+    dependencies = {
       {
         'andersevenrud/cmp-tmux',
-        cond = function() return vim.fn.exists('g:GtkGuiLoaded') == 0 end
+        cond = function() return vim.fn.exists('g:gui_vimr') == 0 end
       },
       {
         'hrsh7th/cmp-nvim-lsp'
@@ -98,103 +93,112 @@ return require('packer').startup(function(use)
       },
       {
         'hrsh7th/cmp-vsnip',
-        requires = 'hrsh7th/vim-vsnip'
+        dependencies = {
+          'hrsh7th/vim-vsnip',
+        },
       }
     },
     config = [[require('config.nvim_cmp')]],
-  }
-  use {
+  },
+  {
     'arzg/vim-colors-xcode',
-    config = 'vim.cmd[[colorscheme xcode]]'
-  }
-  use {
+    lazy = false,
+    priority = 1000,
+    config = function ()
+      vim.cmd[[colorscheme xcode]]
+    end,
+  },
+  {
     'mfussenegger/nvim-dap',
-    requires = { { 'mfussenegger/nvim-dap-python', 'rcarriga/nvim-dap-ui', 'nvim-neotest/nvim-nio' } },
+    dependencies = {
+      'mfussenegger/nvim-dap-python',
+      'rcarriga/nvim-dap-ui',
+      'nvim-neotest/nvim-nio',
+    },
     config = [[require('config.nvim_dap')]],
-  }
-  use {
+  },
+  {
     'neovim/nvim-lspconfig',
     config = [[require('config.nvim_lspconfig')]],
-  }
-  use {
+  },
+  {
     'prettier/vim-prettier',
-  }
-  use {
+  },
+  {
     'nvim-treesitter/nvim-treesitter',
     run = ':TSUpdate',
     config = [[require('config.nvim_treesitter')]],
-  }
-  use 'wbthomason/packer.nvim'
-  use {
+  },
+  {
     'nvim-telescope/telescope.nvim',
-    requires = { { 'nvim-lua/plenary.nvim' } },
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+    },
     config = function()
       vim.keymap.set('n', '<F3>', '<cmd>Telescope buffers<CR>', { noremap = true })
       vim.keymap.set('n', '<F4>', '<cmd>Telescope find_files<CR>', { noremap = true })
       vim.keymap.set('n', '<F6>', '<cmd>Telescope live_grep<CR>', { noremap = true })
     end,
-  }
-  use {
+  },
+  {
     'supercollider/scvim',
     config = function()
       vim.g.scFlash = 1
     end,
     ft = 'supercollider',
-  }
-  use {
+  },
+  {
     'nanozuki/tabby.nvim',
-    requires = {
-      {
-        'nvim-tree/nvim-web-devicons',
-      }
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
     },
     config = [[require('config.tabby')]],
     cond = function() return vim.fn.has('gui_running') == 0 end,
-  }
-  use 'godlygeek/tabular'
-  use {
+  },
+  {
+    'godlygeek/tabular'
+  },
+  {
     'mbbill/undotree',
     cmd = 'UndotreeToggle',
-    setup = function()
+    init = function()
       vim.keymap.set('n', '<F5>', '<cmd>UndotreeToggle<CR>', { noremap = true })
     end,
-  }
-  use {
+  },
+  {
     'linux-cultist/venv-selector.nvim',
     branch = 'regexp',
     config = function ()
       require'venv-selector'.setup()
       vim.keymap.set('n', ',v', '<cmd>VenvSelect<CR>', { noremap = true })
     end
-  }
-  use 'ryanoasis/vim-devicons'
-  use {
+  },
+  {
+    'ryanoasis/vim-devicons'
+  },
+  {
     'Glench/Vim-Jinja2-Syntax',
     ft = 'jinja',
-  }
-  use {
+  },
+  {
     'plasticboy/vim-markdown',
     config = function()
       vim.g.vim_markdown_folding_disabled = 1
     end,
     ft = 'markdown',
-  }
-  use 'junegunn/vim-plug'
-  use {
+  },
+  'junegunn/vim-plug'
+  {
     'tmux-plugins/vim-tmux',
-    cond = function() return vim.fn.exists('g:GtkGuiLoaded') == 0 end,
-  }
-  use {
+    cond = function() return vim.fn.exists('g:gui_vimr') == 0 end,
+  },
+  {
     'tmux-plugins/vim-tmux-focus-events',
-    cond = function() return vim.fn.exists('g:GtkGuiLoaded') == 0 end,
-  }
-  use {
+    cond = function() return vim.fn.exists('g:gui_vimr') == 0 end,
+  },
+  {
     'benmills/vimux',
-    cond = function() return vim.fn.exists('g:GtkGuiLoaded') == 0 end,
+    cond = function() return vim.fn.exists('g:gui_vimr') == 0 end,
     config = [[require('config.vimux')]],
   }
-
-  if packer_bootstrap then
-    require('packer').sync()
-  end
-end)
+}