diff --git a/flake.lock b/flake.lock
index 88308661..fe173624 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1468,6 +1468,22 @@
         "type": "github"
       }
     },
+    "navigator": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716632835,
+        "narHash": "sha256-TP1Fmu6LJFioPskUMWBG+rUNcaxejSF3Fqr5nT6htAY=",
+        "owner": "ray-x",
+        "repo": "navigator.lua",
+        "rev": "877a45747332085ba469f27f5f643ffc4840bb45",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ray-x",
+        "repo": "navigator.lua",
+        "type": "github"
+      }
+    },
     "neogit": {
       "flake": false,
       "locked": {
@@ -1554,6 +1570,7 @@
       "inputs": {
         "d2": "d2",
         "gp-nvim": "gp-nvim",
+        "navigator": "navigator",
         "neogit": "neogit",
         "neorg": "neorg",
         "neorg-telescope": "neorg-telescope",
@@ -1572,7 +1589,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-x82DvwENF0HkU2D+nvaCx2Zk7ZQnE4ImED8RA2u1Cno=",
+        "narHash": "sha256-WXW2vXBo7GVNQVJHY1Zav4sVe4fQm+Qo100DV7Duf9s=",
         "path": "./neovim",
         "type": "path"
       },
diff --git a/neovim/flake.lock b/neovim/flake.lock
index 76a95881..7ce83576 100644
--- a/neovim/flake.lock
+++ b/neovim/flake.lock
@@ -100,6 +100,38 @@
         "type": "github"
       }
     },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_6": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -196,6 +228,54 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -283,6 +363,22 @@
         "type": "github"
       }
     },
+    "guihua": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716805402,
+        "narHash": "sha256-/yWYsgD/MIzcXIlGr5IncoI4uzf627ufyhjhJUq/+9I=",
+        "owner": "ray-x",
+        "repo": "guihua.lua",
+        "rev": "a53b76514ad42d92a821d75d712ef71e71898fcf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ray-x",
+        "repo": "guihua.lua",
+        "type": "github"
+      }
+    },
     "hercules-ci-effects": {
       "inputs": {
         "flake-parts": "flake-parts_3",
@@ -326,6 +422,22 @@
         "type": "github"
       }
     },
+    "navigator": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716632835,
+        "narHash": "sha256-TP1Fmu6LJFioPskUMWBG+rUNcaxejSF3Fqr5nT6htAY=",
+        "owner": "ray-x",
+        "repo": "navigator.lua",
+        "rev": "877a45747332085ba469f27f5f643ffc4840bb45",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ray-x",
+        "repo": "navigator.lua",
+        "type": "github"
+      }
+    },
     "neogit": {
       "flake": false,
       "locked": {
@@ -376,6 +488,38 @@
         "type": "github"
       }
     },
+    "neorg-telescope_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716308299,
+        "narHash": "sha256-zR+r57qnfJ0V1EtsN+gyfHYTTI0I5i/GtjoAYvVmH5Y=",
+        "owner": "nvim-neorg",
+        "repo": "neorg-telescope",
+        "rev": "6069bf428fac56f8c028864eb1bf8beb668fca09",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "neorg-telescope",
+        "type": "github"
+      }
+    },
+    "neorg_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716918645,
+        "narHash": "sha256-DDubayvePQE3lgCnEvLfwrshFqJz9+kfnLBV6G2K9E8=",
+        "owner": "nvim-neorg",
+        "repo": "neorg",
+        "rev": "72da6e0773298356f5a83ce52c9efdd88d4147e5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "neorg",
+        "type": "github"
+      }
+    },
     "neovim-src": {
       "flake": false,
       "locked": {
@@ -429,6 +573,38 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1644486793,
+        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1644486793,
+        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -482,6 +658,72 @@
         "type": "github"
       }
     },
+    "nno": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "neorg": "neorg_2",
+        "neorg-telescope": "neorg-telescope_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "norg": "norg",
+        "norg-meta": "norg-meta"
+      },
+      "locked": {
+        "lastModified": 1716920247,
+        "narHash": "sha256-kIz4xbh+meckfCZksMgb9eWv+EPLCudKmtKoHQ62UQA=",
+        "owner": "nvim-neorg",
+        "repo": "nixpkgs-neorg-overlay",
+        "rev": "ec5592b280ab46f616941880b99d7f76d23e1ee3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "nixpkgs-neorg-overlay",
+        "type": "github"
+      }
+    },
+    "norg": {
+      "inputs": {
+        "flake-compat": "flake-compat_5",
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1672582520,
+        "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=",
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg",
+        "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "ref": "dev",
+        "repo": "tree-sitter-norg",
+        "type": "github"
+      }
+    },
+    "norg-meta": {
+      "inputs": {
+        "flake-compat": "flake-compat_6",
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1713028366,
+        "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=",
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg-meta",
+        "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg-meta",
+        "type": "github"
+      }
+    },
     "nvim-devdocs": {
       "flake": false,
       "locked": {
@@ -561,16 +803,19 @@
       "inputs": {
         "d2": "d2",
         "gp-nvim": "gp-nvim",
+        "guihua": "guihua",
+        "navigator": "navigator",
         "neogit": "neogit",
         "neorg": "neorg",
         "neorg-telescope": "neorg-telescope",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
         "nnn": "nnn",
+        "nno": "nno",
         "nvim-devdocs": "nvim-devdocs",
         "pets": "pets",
         "rest-nvim": "rest-nvim",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "tree-sitter-d2": "tree-sitter-d2",
         "tree-sitter-just": "tree-sitter-just"
       }
@@ -605,6 +850,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tree-sitter-d2": {
       "flake": false,
       "locked": {
diff --git a/neovim/flake.nix b/neovim/flake.nix
index bb3bfcbe..f7ee2f19 100644
--- a/neovim/flake.nix
+++ b/neovim/flake.nix
@@ -54,6 +54,14 @@
       url = "github:terrastruct/d2-vim";
       flake = false;
     };
+    navigator = {
+      url = "github:ray-x/navigator.lua";
+      flake = false;
+    };
+    guihua = {
+      url = "github:ray-x/guihua.lua";
+      flake = false;
+    };
   };
 
   outputs = {
diff --git a/neovim/nvim.nix b/neovim/nvim.nix
index 4591654b..7479ee84 100644
--- a/neovim/nvim.nix
+++ b/neovim/nvim.nix
@@ -448,6 +448,7 @@ in rec {
 
         catcher(require('crates').setup)
         catcher(require('outline').setup)
+        -- catcher(require('navigator').setup)
 
         require('FTerm').setup({
             border     = 'single',
@@ -484,6 +485,7 @@ in rec {
             }
         }
 
+
         require('neorg').setup({
             load = load,
         })
@@ -715,6 +717,8 @@ in rec {
       nvim_context_vt
       nvim-devdocs
 
+      # navigator
+
       iron-nvim
       d2
 
diff --git a/neovim/overlays.nix b/neovim/overlays.nix
index 394381bc..05838c3d 100644
--- a/neovim/overlays.nix
+++ b/neovim/overlays.nix
@@ -8,6 +8,17 @@
           version = "1";
           src = inputs.d2;
         };
+        navigator = final.pkgs.vimUtils.buildVimPlugin {
+          pname = "navigator";
+          version = "1";
+          src = inputs.navigator;
+          dependencies = [final.pkgs.vimPlugins.nvim-lspconfig final.pkgs.vimPlugins.guihua];
+        };
+        guihua = final.pkgs.vimUtils.buildVimPlugin {
+          pname = "guihua";
+          version = "1";
+          src = inputs.guihua;
+        };
         nvim-dap-rr = final.pkgs.vimUtils.buildVimPlugin {
           name = "nvim-dap-rr";
           # TODO: Move to subflake