From 13d270e65aba83b8cdc7ca61d3f8bfcd2ffc08fa Mon Sep 17 00:00:00 2001
From: Tyler Hallada <tyler@hallada.net>
Date: Fri, 1 Dec 2023 15:26:01 -0500
Subject: [PATCH] Install git-conflict and nvim-pqf

---
 lua/install-plugins.lua           | 12 ++++++++++++
 lua/plugins/git-conflict-nvim.lua |  1 +
 lua/plugins/nvim-pqf.lua          |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 lua/plugins/git-conflict-nvim.lua
 create mode 100644 lua/plugins/nvim-pqf.lua

diff --git a/lua/install-plugins.lua b/lua/install-plugins.lua
index 6aab320..f6f6f98 100644
--- a/lua/install-plugins.lua
+++ b/lua/install-plugins.lua
@@ -464,6 +464,18 @@ return require('packer').startup(function(use)
     end,
   }
   use 'NoahTheDuke/vim-just'
+  use {
+    'yorickpeterse/nvim-pqf',
+    config = function()
+      require('plugins.nvim-pqf')
+    end,
+  }
+  use {
+    'akinsho/git-conflict.nvim',
+    config = function()
+      require('plugins.git-conflict-nvim')
+    end,
+  }
 
   -- Automatically set up your configuration after cloning packer.nvim
   -- Put this at the end after all plugins
diff --git a/lua/plugins/git-conflict-nvim.lua b/lua/plugins/git-conflict-nvim.lua
new file mode 100644
index 0000000..0c2c14c
--- /dev/null
+++ b/lua/plugins/git-conflict-nvim.lua
@@ -0,0 +1 @@
+require('git-conflict').setup()
diff --git a/lua/plugins/nvim-pqf.lua b/lua/plugins/nvim-pqf.lua
new file mode 100644
index 0000000..a551a8d
--- /dev/null
+++ b/lua/plugins/nvim-pqf.lua
@@ -0,0 +1 @@
+require('pqf').setup()