diff --git a/common/home.nix b/common/home.nix
index 215c147a..15d63451 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -52,8 +52,8 @@
       mpc-cli
       mmtc
     ] ++ lib.optionals device.isLinux [
-      mpv
       psst
+      mpv
       catppuccinThemes.gtk
       catppuccinThemes.papirus-folders
       gnome.seahorse
@@ -223,7 +223,7 @@
       settings = {
         email = "uttarayan21@gmail.com";
         base_url = "https://pass.uttarayan.me";
-        pinenttry =
+        pinentry =
           if device.isMac then pkgs.pinentry_mac else pkgs.pinentry-qt;
       };
     };
diff --git a/common/nvim.nix b/common/nvim.nix
index 3d83aa0e..72f98290 100644
--- a/common/nvim.nix
+++ b/common/nvim.nix
@@ -18,6 +18,7 @@
       telescope-fzf-native-nvim
       telescope-file-browser-nvim
       telescope-dap-nvim
+      octo-nvim
 
       # Treesitter stuff
       outline-nvim
@@ -195,6 +196,7 @@
         "vff" = "[[<cmd>vertical Gdiffsplit<cr>]]";
         "<C-k>" = "vim.lsp.buf.definition";
         "gi" = "require'telescope.builtin'.lsp_implementations";
+        "gh" = "[[<cmd>Octo actions<cr>]]";
         "<leader>a" = "vim.lsp.buf.code_action";
         "F" = "function() vim.lsp.buf.format({ async = true }) end";
         "<leader><leader>" = "'<c-^>'";
@@ -414,7 +416,7 @@
                 ["core.dirman"] = {
                     config = {
                         workspaces = {
-                            Notes = "~/Nextcloud/Notes",
+                            default = "~/Nextcloud/Notes",
                             Work = "~/Nextcloud/Work",
                         }
                     }
@@ -429,6 +431,12 @@
         require('chatgpt').setup({
             api_key_cmd = "rbw get platform.openai.com",
         })
+
+        require"octo".setup({
+          use_local_fs = false,                    -- use local files on right side of reviews
+          enable_builtin = false,                  -- shows a list of builtin actions when no action is provided
+          default_remote = {"upstream", "origin"};
+        })
       '';
     # builtins.readFile ./extraConfig.lua;
     package = pkgs.neovim-nightly;