diff --git a/README.md b/README.md
index d82af80..8d4fbd0 100755
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ nix build .#vmwareConfigurations.rke2-node
 ### Home Manager
 
 ```bash
-home-manager switch --flake .#evanreichard@MBP-Personal
+home-manager switch --flake .#evanreichard@mac-va-mbp-personal
 ```
 
 ### NixOS Hosts
diff --git a/modules/home/programs/terminal/nvim/config/lua/git-ref.lua b/modules/home/programs/terminal/nvim/config/lua/git-ref.lua
index ecb7dd3..b60aa2a 100755
--- a/modules/home/programs/terminal/nvim/config/lua/git-ref.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/git-ref.lua
@@ -1,4 +1,4 @@
-function get_git_info()
+local function get_git_info()
 	local abs_path = vim.fn.expand("%:p")
 	local git_root = vim.fn.systemlist(
 		"git -C " .. vim.fn.escape(vim.fn.fnamemodify(abs_path, ":h"), " ") .. " rev-parse --show-toplevel"
diff --git a/modules/home/programs/terminal/nvim/config/lua/init.lua b/modules/home/programs/terminal/nvim/config/lua/init.lua
index d316992..e8bfba1 100755
--- a/modules/home/programs/terminal/nvim/config/lua/init.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/init.lua
@@ -8,17 +8,18 @@ require("dap-config")
 require("diffview-config")
 require("git-ref")
 require("git-signs")
-require("llm")
 require("leap-config")
+require("llm")
 require("lsp-config")
 require("lsp-lines-config")
 require("lualine-config")
 require("neotree-config")
 require("noice-config")
 require("numb-config")
+require("octo-config")
 require("silicon-config")
 require("telescope-config")
 require("toggleterm-config")
 require("ts-config")
-require("which-key-config")
 require("weird-chars")
+require("which-key-config")
diff --git a/modules/home/programs/terminal/nvim/config/lua/octo-config.lua b/modules/home/programs/terminal/nvim/config/lua/octo-config.lua
new file mode 100644
index 0000000..4bfd56d
--- /dev/null
+++ b/modules/home/programs/terminal/nvim/config/lua/octo-config.lua
@@ -0,0 +1,30 @@
+require("octo").setup()
+
+vim.keymap.set("n", "<leader>rs", "<cmd>Octo review start<cr>")
+vim.keymap.set("n", "<leader>rd", "<cmd>Octo review discard<cr>")
+vim.keymap.set("n", "<leader>rr", "<cmd>Octo review resume<cr>")
+vim.keymap.set("n", "<leader>re", "<cmd>Octo review submit<cr>")
+vim.keymap.set("n", "<leader>rca", "<cmd>Octo review comments<cr>")
+vim.keymap.set("n", "<leader>rcs", "<cmd>Octo comment suggest<cr>")
+vim.keymap.set("n", "<leader>rcc", "<cmd>Octo comment add<cr>")
+vim.keymap.set("n", "<leader>rcr", "<cmd>Octo comment reply<cr>")
+
+vim.keymap.set("n", "<leader>pd", "<cmd>Octo pr diff<cr>")
+vim.keymap.set("n", "<leader>pc", "<cmd>Octo pr changes<cr>")
+
+-- vim.api.nvim_create_autocmd("FileType", {
+-- 	pattern = "octo",
+-- 	callback = function()
+-- 		vim.keymap.set("n", "<leader>rs", "<cmd>Octo review start<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rd", "<cmd>Octo review discard<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rr", "<cmd>Octo review resume<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>re", "<cmd>Octo review submit<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rca", "<cmd>Octo review comments<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rcs", "<cmd>Octo comment suggest<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rcc", "<cmd>Octo comment add<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>rcr", "<cmd>Octo comment reply<cr>", { buffer = true })
+--
+-- 		vim.keymap.set("n", "<leader>pd", "<cmd>Octo pr diff<cr>", { buffer = true })
+-- 		vim.keymap.set("n", "<leader>pc", "<cmd>Octo pr changes<cr>", { buffer = true })
+-- 	end,
+-- })
diff --git a/modules/home/programs/terminal/nvim/config/lua/telescope-config.lua b/modules/home/programs/terminal/nvim/config/lua/telescope-config.lua
index 9442ca9..0283898 100755
--- a/modules/home/programs/terminal/nvim/config/lua/telescope-config.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/telescope-config.lua
@@ -14,9 +14,10 @@ require("telescope").load_extension("ui-select")
 require("telescope").load_extension("undo")
 
 local builtin = require("telescope.builtin")
-vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
-vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
-vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
-vim.keymap.set("n", "<leader>fj", builtin.jumplist, {})
+vim.keymap.set("n", "<leader>ff", builtin.find_files)
+vim.keymap.set("n", "<leader>fg", builtin.live_grep)
+vim.keymap.set("n", "<leader>fb", builtin.buffers)
+vim.keymap.set("n", "<leader>fh", builtin.help_tags)
+vim.keymap.set("n", "<leader>fj", builtin.jumplist)
 vim.keymap.set("n", "<leader>fu", "<cmd>Telescope undo<cr>")
+vim.keymap.set("n", "<leader>fp", "<cmd>Octo pr list<cr>")
diff --git a/modules/home/programs/terminal/nvim/config/lua/ts-config.lua b/modules/home/programs/terminal/nvim/config/lua/ts-config.lua
index e2e648c..3a662eb 100755
--- a/modules/home/programs/terminal/nvim/config/lua/ts-config.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/ts-config.lua
@@ -1,3 +1,4 @@
-require'nvim-treesitter.configs'.setup {
-    highlight = {enable = true, additional_vim_regex_highlighting = false}
-}
+require("nvim-treesitter.configs").setup({
+	highlight = { enable = true, additional_vim_regex_highlighting = false },
+})
+vim.treesitter.language.register("markdown", "octo")
diff --git a/modules/home/programs/terminal/nvim/config/lua/which-key-config.lua b/modules/home/programs/terminal/nvim/config/lua/which-key-config.lua
index bfba876..280cdbd 100755
--- a/modules/home/programs/terminal/nvim/config/lua/which-key-config.lua
+++ b/modules/home/programs/terminal/nvim/config/lua/which-key-config.lua
@@ -16,6 +16,7 @@ wk.add({
 	{ "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Live Grep" },
 	{ "<leader>fh", "<cmd>Telescope help_tags<cr>", desc = "Help Tags" },
 	{ "<leader>fj", "<cmd>Telescope jumplist<cr>", desc = "Jump List" },
+	{ "<leader>fp", "<cmd>Octo pr list<cr>", desc = "PR List" },
 	{ "<leader>g", group = "DiffView" },
 	{ "<leader>gB", desc = "Git Blame Full" },
 	{ "<leader>gH", "<cmd>DiffviewFileHistory --range=origin..HEAD<cr>", desc = "Diff History - Main" },
diff --git a/modules/home/programs/terminal/nvim/default.nix b/modules/home/programs/terminal/nvim/default.nix
index 0e9878a..e81303d 100755
--- a/modules/home/programs/terminal/nvim/default.nix
+++ b/modules/home/programs/terminal/nvim/default.nix
@@ -52,6 +52,7 @@ in
         toggleterm-nvim # Terminal Helper
         vim-nix # Nix Helpers
         which-key-nvim # Shortcut Helper
+        octo-nvim # Git Octo
 
         # ------------------
         # --- Theme / UI ---