Add <C-k> to nvim

flake.lock

@@ -139,11 +139,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760948891,
+        "lastModified": 1769996383,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -233,11 +233,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771188132,
+        "lastModified": 1772516620,
-        "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=",
+        "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9",
+        "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771102945,
+        "lastModified": 1772330611,
-        "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=",
+        "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399",
+        "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400",
         "type": "github"
       },
       "original": {
@@ -309,11 +309,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1758834834,
+        "lastModified": 1770419553,
-        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
+        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
+        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
         "type": "github"
       },
       "original": {
@@ -330,15 +330,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1765720983,
+        "lastModified": 1768214250,
-        "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
+        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
+        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
         "type": "github"
       },
       "original": {
         "owner": "feel-co",
+        "ref": "refs/tags/v2.6.0",
         "repo": "ndg",
         "type": "github"
       }
@@ -470,11 +471,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1771008912,
+        "lastModified": 1772433332,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705",
         "type": "github"
       },
       "original": {
@@ -537,16 +538,15 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1767628834,
+        "lastModified": 1772483693,
-        "narHash": "sha256-qiPFYDicHq4/ji0/9QxVM8hhjspsJrYcMR/S3zKlfjQ=",
+        "narHash": "sha256-sOq/GUSR0uw1eQla0Wc5BKztPqBJBj3khd/GhaVg4xU=",
-        "owner": "thamenato",
+        "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "7161c8d857cf7c641433cc750a1a3666f82a3ff0",
+        "rev": "750dbfaf6eb62db8e67afc03a3ae3078bfd8f098",
         "type": "github"
       },
       "original": {
-        "owner": "thamenato",
+        "owner": "NotAShelf",
-        "ref": "fix-nvim-treesitter",
         "repo": "nvf",
         "type": "github"
       }
@@ -573,11 +573,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771166946,
+        "lastModified": 1772495394,
-        "narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=",
+        "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa",
+        "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
         "type": "github"
       },
       "original": {
@@ -626,11 +626,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1770914701,
+        "lastModified": 1772296853,
-        "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=",
+        "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "db03fed72e5ca02be34e1d24789345a943329738",
+        "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
         "type": "github"
       },
       "original": {
@@ -794,11 +794,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771222275,
+        "lastModified": 1772517053,
-        "narHash": "sha256-df+Un2QnDj95MQxmsnopCtSy/meWO2RDHuMGAqq3nlc=",
+        "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "a20f5d0c6454b5b24a497afb280427c9af33a0be",
+        "rev": "32e9673aee2ae994ced561247918952398a3e933",
         "type": "github"
       },
       "original": {

flake.nix

@@ -14,8 +14,7 @@
     nix-alien.url = "github:thiagokokada/nix-alien";
 
     nvf = {
-      # url = "github:NotAShelf/nvf";
+      url = "github:NotAShelf/nvf";
-      url = "github:thamenato/nvf/fix-nvim-treesitter";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

hosts/murk/home.nix

@@ -19,11 +19,13 @@ in {
   mods.terminal.emulator.enable = true;
   mods.terminal.development.enable = true;
   mods.terminal.tools.enable = true;
+  mods.terminal.gh.enable = true;
   mods.terminal.hr.enable = true;
   mods.desktop.development.enable = true;
   mods.desktop.productivity.enable = false;
   mods.zen.enable = true;
   mods.obsidian.enable = true;
+  mods.octo.enable = true;
   mods.theme.slideshow = true;
 
   home.packages = with pkgs;
@@ -44,7 +46,6 @@ in {
       go
       rainfrog
       tealdeer
-      gh
       (callPackage ./packages/mender-cli.nix {})
     ]
     # Non-free </3

hosts/musk/home.nix

@@ -17,10 +17,12 @@ in {
   mods.terminal.emulator.enable = true;
   mods.terminal.development.enable = true;
   mods.terminal.tools.enable = true;
+  mods.terminal.gh.enable = true;
   mods.terminal.hr.enable = true;
   mods.desktop.development.enable = true;
   mods.desktop.productivity.enable = false;
   mods.zen.enable = true;
+  mods.octo.enable = true;
 
   home.packages = with pkgs;
     [
@@ -40,7 +42,6 @@ in {
       go
       rainfrog
       tealdeer
-      gh
       (callPackage ./packages/mender-cli.nix {})
     ]
     # Non-free </3

modules/home/terminal/default.nix

@@ -14,6 +14,7 @@
     ./nvim
     ./zellij
     ./opencode
+    ./gh.nix
   ];
 
   config = lib.mkIf osConfig.mods.desktop.enable {

modules/home/terminal/gh.nix

@@ -0,0 +1,30 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  options.mods.terminal.gh.enable = lib.mkEnableOption "enables gh and gh-dash";
+
+  config = lib.mkIf config.mods.terminal.gh.enable {
+    programs.gh = {
+      enable = true;
+      extensions = [pkgs.gh-dash];
+    };
+
+    programs.gh-dash = {
+      enable = true;
+      settings = {
+        keybindings = {
+          prs = [
+            {
+              key = "C";
+              command = "nvim -c 'Octo pr edit {{.PrNumber}}'";
+              description = "Open PR in Octo.nvim";
+            }
+          ];
+        };
+      };
+    };
+  };
+}

modules/home/terminal/nvim/default.nix

@@ -23,6 +23,7 @@ in {
   imports = [
     inputs.nvf.homeManagerModules.default
     ./obsidian.nix
+    ./octo.nix
   ];
 
   config = lib.mkIf config.mods.nvim.enable {
@@ -60,6 +61,13 @@ in {
               action = "<cmd>lua vim.lsp.buf.definition()<CR>";
               desc = "Go to Definition";
             }
+            {
+              key = "<C-k>";
+              mode = ["n"];
+              action = "<cmd>FzfLua combine pickers=keymaps;commands<CR>";
+              silent = true;
+              desc = "FzfLua keymaps and commands";
+            }
           ];
 
           languages = {
@@ -93,6 +101,7 @@ in {
 
           statusline.lualine.enable = true;
           telescope.enable = true;
+          fzf-lua.enable = true;
           autocomplete.nvim-cmp.enable = true;
           autopairs.nvim-autopairs.enable = true;
           tabline.nvimBufferline.enable = true;

modules/home/terminal/nvim/octo.nix

@@ -0,0 +1,54 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  options.mods.octo.enable =
+    lib.mkEnableOption "enables octo";
+
+  config = lib.mkIf config.mods.octo.enable {
+    programs.nvf.settings.vim.lazy.plugins."octo.nvim" = {
+      package = pkgs.vimPlugins.octo-nvim;
+      setupModule = "octo";
+      setupOpts = {
+        picker = "telescope";
+        enable_builtin = true;
+      };
+      cmd = ["Octo"];
+      keys = [
+        {
+          key = "<leader>oi";
+          mode = "n";
+          action = "<CMD>Octo issue list<CR>";
+          desc = "List GitHub Issues";
+        }
+        {
+          key = "<leader>op";
+          mode = "n";
+          action = "<CMD>Octo pr list<CR>";
+          desc = "List GitHub PullRequests";
+        }
+        {
+          key = "<leader>od";
+          mode = "n";
+          action = "<CMD>Octo discussion list<CR>";
+          desc = "List GitHub Discussions";
+        }
+        {
+          key = "<leader>on";
+          mode = "n";
+          action = "<CMD>Octo notification list<CR>";
+          desc = "List GitHub Notifications";
+        }
+        {
+          key = "<leader>os";
+          mode = "n";
+          action = "function() require('octo.utils').create_base_search_command { include_current_repo = true } end";
+          lua = true;
+          desc = "Search GitHub";
+        }
+      ];
+    };
+  };
+}