diff --git a/lua/peter/plugins/core/git.lua b/lua/peter/plugins/core/git.lua
index 8132904..8aa1a26 100644
--- a/lua/peter/plugins/core/git.lua
+++ b/lua/peter/plugins/core/git.lua
@@ -9,6 +9,13 @@ local P = require("peter.util.plugins.plugins")
 
 ---@type LazyPluginSpec[]
 return {
+  {
+    "esmuellert/vscode-diff.nvim",
+    enabled = false,
+    dependencies = { "MunifTanjim/nui.nvim" },
+    branch = "next",
+    cmd = "CodeDiff",
+  },
   {
     "NeogitOrg/neogit",
     dependencies = {
diff --git a/lua/peter/plugins/core/github.lua b/lua/peter/plugins/core/github.lua
new file mode 100644
index 0000000..2b92a1f
--- /dev/null
+++ b/lua/peter/plugins/core/github.lua
@@ -0,0 +1,54 @@
+---@module "octo"
+
+return {
+  {
+    "pwntester/octo.nvim",
+    enabled = false,
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "folke/snacks.nvim",
+    },
+    cmd = "Octo",
+    ---@type OctoConfig
+    ---@diagnostic disable-next-line: missing-fields
+    opts = {
+      picker = "snacks",
+      enable_builtin = true,
+    },
+    keys = {
+      {
+        "<leader>oi",
+        "<CMD>Octo issue list<CR>",
+        desc = "List GitHub Issues",
+      },
+      {
+        "<leader>op",
+        "<CMD>Octo pr list<CR>",
+        desc = "List GitHub PullRequests",
+      },
+      {
+        "<leader>od",
+        "<CMD>Octo discussion list<CR>",
+        desc = "List GitHub Discussions",
+      },
+      {
+        "<leader>on",
+        "<CMD>Octo notification list<CR>",
+        desc = "List GitHub Notifications",
+      },
+      {
+        "<leader>os",
+        function()
+          require("octo.utils").create_base_search_command({
+            include_current_repo = true,
+          })
+        end,
+        desc = "Search GitHub",
+      },
+    },
+    config = function(_, opts)
+      require("peter.util.icons").try_mock_nvim_web_devicons()
+      require("octo").setup(opts)
+    end,
+  },
+}