diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
new file mode 100644
index 00000000..c91e10cd
--- /dev/null
+++ b/lua/custom/plugins/copilot.lua
@@ -0,0 +1,16 @@
+return {
+  { "github/copilot.vim", cmd = "Copilot", event = "InsertEnter" },
+  {
+    "CopilotC-Nvim/CopilotChat.nvim",
+    branch = "canary",
+    dependencies = {
+      { "zbirenbaum/copilot.lua" }, -- or github/copilot.vim
+      { "nvim-lua/plenary.nvim" }, -- for curl, log wrapper
+    },
+    opts = {
+      debug = true, -- Enable debugging
+      -- See Configuration section for rest
+    },
+    -- See Commands section for default commands if you want to lazy load on them
+  },
+}
diff --git a/lua/custom/plugins/format.lua b/lua/custom/plugins/format.lua
index 79155899..2900aaf1 100644
--- a/lua/custom/plugins/format.lua
+++ b/lua/custom/plugins/format.lua
@@ -32,6 +32,7 @@ return { -- Autoformat
       css = { "prettier" },
       scss = { "prettier" },
       php = { "php-cs-fixer" },
+      json = { "prettier" },
       -- Conform can also run multiple formatters sequentially
       python = { "isort", "black" },
     },
@@ -46,12 +47,6 @@ return { -- Autoformat
           return vim.fs.find({ "dprint.json" }, { path = ctx.filename, upward = true })[1]
         end,
       },
-      prettier = {
-        condition = function(ctx)
-          return vim.fs.find({ ".prettierrc" }, { path = ctx.filename, upward = true })[1]
-        end,
-      },
-      --
       -- Example of using shfmt with extra args
       shfmt = {
         extra_args = { "-i", "2", "-ci" },
diff --git a/lua/custom/plugins/git.lua b/lua/custom/plugins/git.lua
index 50c7a626..36ee7a2a 100644
--- a/lua/custom/plugins/git.lua
+++ b/lua/custom/plugins/git.lua
@@ -1,13 +1,27 @@
 -- See `:help gitsigns` to understand what the configuration keys do
-return { -- Adds git related signs to the gutter, as well as utilities for managing changes
-  "lewis6991/gitsigns.nvim",
-  opts = {
-    signs = {
-      add = { text = "+" },
-      change = { text = "~" },
-      delete = { text = "_" },
-      topdelete = { text = "‾" },
-      changedelete = { text = "~" },
+return {
+  { -- Adds git related signs to the gutter, as well as utilities for managing changes
+    "lewis6991/gitsigns.nvim",
+    opts = {
+      signs = {
+        add = { text = "+" },
+        change = { text = "~" },
+        delete = { text = "_" },
+        topdelete = { text = "‾" },
+        changedelete = { text = "~" },
+      },
+    },
+    {
+      "pwntester/octo.nvim",
+      requires = {
+        "nvim-lua/plenary.nvim",
+        "nvim-telescope/telescope.nvim",
+        -- OR 'ibhagwan/fzf-lua',
+        "nvim-tree/nvim-web-devicons",
+      },
+      config = function()
+        require("octo").setup()
+      end,
     },
   },
 }