diff --git a/build/nixos/unmanaged/laptop-framework/flake.lock b/build/nixos/unmanaged/laptop-framework/flake.lock
index 48dc2269..48966e99 100644
--- a/build/nixos/unmanaged/laptop-framework/flake.lock
+++ b/build/nixos/unmanaged/laptop-framework/flake.lock
@@ -45,30 +45,6 @@
         "type": "github"
       }
     },
-    "beautysh_2": {
-      "inputs": {
-        "nixpkgs": [
-          "home",
-          "nixvim",
-          "nixpkgs"
-        ],
-        "poetry2nix": "poetry2nix_2",
-        "utils": "utils_2"
-      },
-      "locked": {
-        "lastModified": 1680308980,
-        "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=",
-        "owner": "lovesegfault",
-        "repo": "beautysh",
-        "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lovesegfault",
-        "repo": "beautysh",
-        "type": "github"
-      }
-    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -91,23 +67,57 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
+    "final-nixpkgs": {
+      "inputs": {
+        "flake-compat": [
+          "home",
+          "vim",
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "home",
+          "vim",
+          "flake-parts"
+        ],
+        "flake-utils": [
+          "home",
+          "vim",
+          "flake-utils"
+        ],
+        "hercules-ci-agent": "hercules-ci-agent_2",
+        "hercules-ci-effects": [
+          "home",
+          "vim",
+          "hercules-ci-effects"
+        ],
+        "neovim-flake": [
+          "home",
+          "vim",
+          "neovim-flake"
+        ],
+        "neovim-nightly-overlay": [
+          "home",
+          "vim",
+          "neovim-nightly-overlay"
+        ],
+        "nixpkgs": [
+          "home",
+          "vim",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
+        "lastModified": 1,
+        "narHash": "sha256-yYcrbWsJgptQlqoji9v1P05XYyyD4VxgDDQaa2xAyJ4=",
+        "path": "./pkgs",
+        "type": "path"
       },
       "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
+        "path": "./pkgs",
+        "type": "path"
       }
     },
-    "flake-compat_2": {
+    "flake-compat": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -123,7 +133,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -212,47 +222,9 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_5": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "home",
-          "nixvim",
           "pre-commit-hooks",
           "nixpkgs"
         ]
@@ -271,28 +243,23 @@
         "type": "github"
       }
     },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
+    "haskell-flake": {
       "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "lastModified": 1684780604,
+        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
+        "owner": "srid",
+        "repo": "haskell-flake",
+        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
+        "owner": "srid",
+        "ref": "0.3.0",
+        "repo": "haskell-flake",
         "type": "github"
       }
     },
-    "haskell-flake": {
+    "haskell-flake_2": {
       "locked": {
         "lastModified": 1684780604,
         "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
@@ -308,7 +275,7 @@
         "type": "github"
       }
     },
-    "haskell-flake_2": {
+    "haskell-flake_3": {
       "locked": {
         "lastModified": 1684780604,
         "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
@@ -353,9 +320,39 @@
         "flake-parts": [
           "home",
           "vim",
+          "final-nixpkgs",
           "flake-parts"
         ],
         "haskell-flake": "haskell-flake_2",
+        "nixpkgs": [
+          "home",
+          "vim",
+          "final-nixpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693397971,
+        "narHash": "sha256-P5PQ8KzK/SXvEsw+AzG7OBUgnGhuUzKETNHhqVokc+0=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "rev": "344b8b1079731a8c1e144119174f684fb492e03a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "type": "github"
+      }
+    },
+    "hercules-ci-agent_3": {
+      "inputs": {
+        "flake-parts": [
+          "home",
+          "vim",
+          "flake-parts"
+        ],
+        "haskell-flake": "haskell-flake_3",
         "nixpkgs": [
           "home",
           "vim",
@@ -434,7 +431,6 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixvim": "nixvim",
         "pre-commit-hooks": [
           "pre-commit-hooks"
         ],
@@ -442,7 +438,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-b4XD3JEOuerAyAymXh9ouBVEpPyE0L4fJAI5aSDkwaM=",
+        "narHash": "sha256-oQ98Xajeb+OXJFQ7IIncQmaS4RthNVLeqEXKMdrxc10=",
         "path": "./flakes/home",
         "type": "path"
       },
@@ -481,11 +477,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1696187451,
-        "narHash": "sha256-AiGMtsPP6DiCgBjHJSPlr49+Oov2WdTDPd+ffZgkT5o=",
+        "lastModified": 1696214733,
+        "narHash": "sha256-2IqDjWfqhy7MbCbFs3GDRYIpfK2usL+CYGfh6uskK/0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "9ce1623837a817c3f4f5deff9c8ba862578b6009",
+        "rev": "09a17f91d0d362c6e58bfdbe3ccdeacffb0b44b9",
         "type": "github"
       },
       "original": {
@@ -580,38 +576,25 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1685801374,
-        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
-        "beautysh": "beautysh_2",
+        "beautysh": [
+          "beautysh"
+        ],
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
-          "home",
           "nixpkgs"
         ],
-        "pre-commit-hooks": "pre-commit-hooks"
+        "pre-commit-hooks": [
+          "pre-commit-hooks"
+        ]
       },
       "locked": {
-        "lastModified": 1696176774,
-        "narHash": "sha256-v8wBRXh3Xxu21pz5KPA50w445ghGO0OSPnM/13xvNy4=",
+        "lastModified": 1696211800,
+        "narHash": "sha256-l+gpz9TnPUJ/0iRnnQbKFdWuMpkygNS2TkvWvwszVB8=",
         "owner": "developing-today-forks",
         "repo": "nixvim-flake",
-        "rev": "47b72e41dde4bd1ca89c6852f20d2818587342d4",
+        "rev": "d3df753c8fcdafbc992626f3c72ccf9512fb3837",
         "type": "github"
       },
       "original": {
@@ -620,69 +603,50 @@
         "type": "github"
       }
     },
-    "nixvim_2": {
+    "nixvim-upstream": {
       "inputs": {
         "beautysh": [
+          "home",
+          "vim",
           "beautysh"
         ],
-        "flake-utils": "flake-utils_4",
+        "flake-utils": [
+          "home",
+          "vim",
+          "flake-utils"
+        ],
         "nixpkgs": [
-          "nixpkgs"
+          "home",
+          "vim",
+          "final-nixpkgs"
         ],
         "pre-commit-hooks": [
+          "home",
+          "vim",
           "pre-commit-hooks"
         ]
       },
       "locked": {
         "lastModified": 1696176774,
         "narHash": "sha256-v8wBRXh3Xxu21pz5KPA50w445ghGO0OSPnM/13xvNy4=",
-        "owner": "developing-today-forks",
-        "repo": "nixvim-flake",
-        "rev": "47b72e41dde4bd1ca89c6852f20d2818587342d4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "developing-today-forks",
-        "repo": "nixvim-flake",
-        "type": "github"
-      }
-    },
-    "poetry2nix": {
-      "inputs": {
-        "flake-utils": [
-          "beautysh",
-          "utils"
-        ],
-        "nixpkgs": [
-          "beautysh",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1658665240,
-        "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=",
         "owner": "nix-community",
-        "repo": "poetry2nix",
-        "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f",
+        "repo": "nixvim",
+        "rev": "47b72e41dde4bd1ca89c6852f20d2818587342d4",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "poetry2nix",
+        "repo": "nixvim",
         "type": "github"
       }
     },
-    "poetry2nix_2": {
+    "poetry2nix": {
       "inputs": {
         "flake-utils": [
-          "home",
-          "nixvim",
           "beautysh",
           "utils"
         ],
         "nixpkgs": [
-          "home",
-          "nixvim",
           "beautysh",
           "nixpkgs"
         ]
@@ -707,36 +671,10 @@
         "flake-utils": "flake-utils_3",
         "gitignore": "gitignore",
         "nixpkgs": [
-          "home",
-          "nixvim",
           "nixpkgs"
         ],
         "nixpkgs-stable": "nixpkgs-stable"
       },
-      "locked": {
-        "lastModified": 1695576016,
-        "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks_2": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_5",
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
-      },
       "locked": {
         "lastModified": 1696158581,
         "narHash": "sha256-h0vY4E7Lx95lpYQbG2w4QH4yG5wCYOvPJzK93wVQbT0=",
@@ -766,8 +704,8 @@
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nix-software-center": "nix-software-center",
         "nixpkgs": "nixpkgs",
-        "nixvim": "nixvim_2",
-        "pre-commit-hooks": "pre-commit-hooks_2",
+        "nixvim": "nixvim",
+        "pre-commit-hooks": "pre-commit-hooks",
         "zig-overlay": "zig-overlay"
       }
     },
@@ -833,36 +771,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "utils": {
       "locked": {
         "lastModified": 1678901627,
@@ -878,27 +786,13 @@
         "type": "github"
       }
     },
-    "utils_2": {
-      "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "vim": {
       "inputs": {
         "beautysh": [
           "home",
           "beautysh"
         ],
+        "final-nixpkgs": "final-nixpkgs",
         "flake-compat": [
           "home",
           "flake-compat"
@@ -911,7 +805,7 @@
           "home",
           "flake-utils"
         ],
-        "hercules-ci-agent": "hercules-ci-agent_2",
+        "hercules-ci-agent": "hercules-ci-agent_3",
         "hercules-ci-effects": [
           "home",
           "hercules-ci-effects"
@@ -928,10 +822,7 @@
           "home",
           "nixpkgs"
         ],
-        "nixvim-upstream": [
-          "home",
-          "nixvim"
-        ],
+        "nixvim-upstream": "nixvim-upstream",
         "pre-commit-hooks": [
           "home",
           "pre-commit-hooks"
@@ -939,7 +830,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JDk6H9sai7DXak4ok8qXDZDC76/ytlF+YNaYhGnntu4=",
+        "narHash": "sha256-YphydUmSAy73Kb6166ZNQDosP3aKbRZ196zPda++6U4=",
         "path": "./programs/nixvim",
         "type": "path"
       },
diff --git a/build/nixos/unmanaged/laptop-framework/flake.nix b/build/nixos/unmanaged/laptop-framework/flake.nix
index 6a509516..8a65977d 100644
--- a/build/nixos/unmanaged/laptop-framework/flake.nix
+++ b/build/nixos/unmanaged/laptop-framework/flake.nix
@@ -112,7 +112,7 @@
       alejandra.overlay
       nix-software-center.overlay
     ];
-    systemNixOsModules = [
+    systemNixosModules = [
       {
         nixpkgs = {
           overlays = overlays; # are overlays needed in home manager? document which/why?
@@ -122,12 +122,12 @@
       }
       ./modules/configuration.nix # this relies on magic overlays, ? todo: remove overlays from configuration.nix? then add inline let overlay configuration right here below this moduleArrayList.
     ];
-    # overlayNixOsModules = ?
-    hyprlandNixOsModules = [
-      (import ./modules/hyprland.nix) # hyprland = would use flake for hyprland master but had annoying warning about waybar? todo try again. prefer flake. the config for this is setup in homeManager for reasons. could be brought out to nixos module would probably fit better due to my agonies
+    # overlayNixosModules = ?
+    hyprlandNixosModules = [
+      (import ./modules/hyprland.nix) # hyprland = would use flake for hyprland master but had annoying warning about waybar? todo try again. prefer flake. the config for this is setup in homeManager for reasons. could be brought out to Nixos module would probably fit better due to my agonies
       #       (import ./modules/nm-applet.nix)
     ];
-    homeManagerNixOsModules = home.homeManagerNixOsModules stateVersion;
+    homeManagerNixosModules = home.homeManagerNixosModules stateVersion;
     system = "x86_64-linux";
     pkgs = import nixpkgs {
       system = system;
@@ -137,9 +137,9 @@
     nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
       inherit system;
       modules =
-        systemNixOsModules
-        ++ hyprlandNixOsModules
-        ++ homeManagerNixOsModules;
+        systemNixosModules
+        ++ hyprlandNixosModules
+        ++ homeManagerNixosModules;
     };
   };
   # cachix
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/flake.lock b/build/nixos/unmanaged/laptop-framework/flakes/home/flake.lock
index 32c4dab6..f9ee6589 100644
--- a/build/nixos/unmanaged/laptop-framework/flakes/home/flake.lock
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/flake.lock
@@ -22,27 +22,47 @@
         "type": "github"
       }
     },
-    "beautysh_2": {
+    "final-nixpkgs": {
       "inputs": {
+        "flake-compat": [
+          "vim",
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "vim",
+          "flake-parts"
+        ],
+        "flake-utils": [
+          "vim",
+          "flake-utils"
+        ],
+        "hercules-ci-agent": "hercules-ci-agent_2",
+        "hercules-ci-effects": [
+          "vim",
+          "hercules-ci-effects"
+        ],
+        "neovim-flake": [
+          "vim",
+          "neovim-flake"
+        ],
+        "neovim-nightly-overlay": [
+          "vim",
+          "neovim-nightly-overlay"
+        ],
         "nixpkgs": [
-          "nixvim",
+          "vim",
           "nixpkgs"
-        ],
-        "poetry2nix": "poetry2nix_2",
-        "utils": "utils_2"
+        ]
       },
       "locked": {
-        "lastModified": 1680308980,
-        "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=",
-        "owner": "lovesegfault",
-        "repo": "beautysh",
-        "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c",
-        "type": "github"
+        "lastModified": 1,
+        "narHash": "sha256-yYcrbWsJgptQlqoji9v1P05XYyyD4VxgDDQaa2xAyJ4=",
+        "path": "./pkgs",
+        "type": "path"
       },
       "original": {
-        "owner": "lovesegfault",
-        "repo": "beautysh",
-        "type": "github"
+        "path": "./pkgs",
+        "type": "path"
       }
     },
     "flake-compat": {
@@ -77,22 +97,6 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -134,42 +138,6 @@
       "inputs": {
         "systems": "systems_2"
       },
-      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
       "locked": {
         "lastModified": 1685518550,
         "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@@ -187,7 +155,6 @@
     "gitignore": {
       "inputs": {
         "nixpkgs": [
-          "nixvim",
           "pre-commit-hooks",
           "nixpkgs"
         ]
@@ -206,28 +173,23 @@
         "type": "github"
       }
     },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
+    "haskell-flake": {
       "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "lastModified": 1684780604,
+        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
+        "owner": "srid",
+        "repo": "haskell-flake",
+        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
+        "owner": "srid",
+        "ref": "0.3.0",
+        "repo": "haskell-flake",
         "type": "github"
       }
     },
-    "haskell-flake": {
+    "haskell-flake_2": {
       "locked": {
         "lastModified": 1684780604,
         "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
@@ -243,7 +205,7 @@
         "type": "github"
       }
     },
-    "haskell-flake_2": {
+    "haskell-flake_3": {
       "locked": {
         "lastModified": 1684780604,
         "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
@@ -287,9 +249,37 @@
       "inputs": {
         "flake-parts": [
           "vim",
+          "final-nixpkgs",
           "flake-parts"
         ],
         "haskell-flake": "haskell-flake_2",
+        "nixpkgs": [
+          "vim",
+          "final-nixpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693397971,
+        "narHash": "sha256-P5PQ8KzK/SXvEsw+AzG7OBUgnGhuUzKETNHhqVokc+0=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "rev": "344b8b1079731a8c1e144119174f684fb492e03a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "type": "github"
+      }
+    },
+    "hercules-ci-agent_3": {
+      "inputs": {
+        "flake-parts": [
+          "vim",
+          "flake-parts"
+        ],
+        "haskell-flake": "haskell-flake_3",
         "nixpkgs": [
           "vim",
           "nixpkgs"
@@ -365,11 +355,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1696187451,
-        "narHash": "sha256-AiGMtsPP6DiCgBjHJSPlr49+Oov2WdTDPd+ffZgkT5o=",
+        "lastModified": 1696214733,
+        "narHash": "sha256-2IqDjWfqhy7MbCbFs3GDRYIpfK2usL+CYGfh6uskK/0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "9ce1623837a817c3f4f5deff9c8ba862578b6009",
+        "rev": "09a17f91d0d362c6e58bfdbe3ccdeacffb0b44b9",
         "type": "github"
       },
       "original": {
@@ -441,79 +431,46 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1685801374,
-        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixvim": {
+    "nixvim-upstream": {
       "inputs": {
-        "beautysh": "beautysh_2",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
+        "beautysh": [
+          "vim",
+          "beautysh"
         ],
-        "pre-commit-hooks": "pre-commit-hooks"
-      },
-      "locked": {
-        "lastModified": 1696176774,
-        "narHash": "sha256-v8wBRXh3Xxu21pz5KPA50w445ghGO0OSPnM/13xvNy4=",
-        "owner": "developing-today-forks",
-        "repo": "nixvim-flake",
-        "rev": "47b72e41dde4bd1ca89c6852f20d2818587342d4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "developing-today-forks",
-        "repo": "nixvim-flake",
-        "type": "github"
-      }
-    },
-    "poetry2nix": {
-      "inputs": {
         "flake-utils": [
-          "beautysh",
-          "utils"
+          "vim",
+          "flake-utils"
         ],
         "nixpkgs": [
-          "beautysh",
-          "nixpkgs"
+          "vim",
+          "final-nixpkgs"
+        ],
+        "pre-commit-hooks": [
+          "vim",
+          "pre-commit-hooks"
         ]
       },
       "locked": {
-        "lastModified": 1658665240,
-        "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=",
+        "lastModified": 1696176774,
+        "narHash": "sha256-v8wBRXh3Xxu21pz5KPA50w445ghGO0OSPnM/13xvNy4=",
         "owner": "nix-community",
-        "repo": "poetry2nix",
-        "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f",
+        "repo": "nixvim",
+        "rev": "47b72e41dde4bd1ca89c6852f20d2818587342d4",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "poetry2nix",
+        "repo": "nixvim",
         "type": "github"
       }
     },
-    "poetry2nix_2": {
+    "poetry2nix": {
       "inputs": {
         "flake-utils": [
-          "nixvim",
           "beautysh",
           "utils"
         ],
         "nixpkgs": [
-          "nixvim",
           "beautysh",
           "nixpkgs"
         ]
@@ -535,38 +492,13 @@
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "gitignore": "gitignore",
         "nixpkgs": [
-          "nixvim",
           "nixpkgs"
         ],
         "nixpkgs-stable": "nixpkgs-stable"
       },
-      "locked": {
-        "lastModified": 1695576016,
-        "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks_2": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_4",
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
-      },
       "locked": {
         "lastModified": 1696158581,
         "narHash": "sha256-h0vY4E7Lx95lpYQbG2w4QH4yG5wCYOvPJzK93wVQbT0=",
@@ -593,8 +525,7 @@
         "neovim-flake": "neovim-flake",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixpkgs": "nixpkgs",
-        "nixvim": "nixvim",
-        "pre-commit-hooks": "pre-commit-hooks_2",
+        "pre-commit-hooks": "pre-commit-hooks",
         "vim": "vim"
       }
     },
@@ -628,36 +559,6 @@
         "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"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "utils": {
       "locked": {
         "lastModified": 1678901627,
@@ -673,26 +574,12 @@
         "type": "github"
       }
     },
-    "utils_2": {
-      "locked": {
-        "lastModified": 1678901627,
-        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "vim": {
       "inputs": {
         "beautysh": [
           "beautysh"
         ],
+        "final-nixpkgs": "final-nixpkgs",
         "flake-compat": [
           "flake-compat"
         ],
@@ -702,7 +589,7 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "hercules-ci-agent": "hercules-ci-agent_2",
+        "hercules-ci-agent": "hercules-ci-agent_3",
         "hercules-ci-effects": [
           "hercules-ci-effects"
         ],
@@ -715,16 +602,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixvim-upstream": [
-          "nixvim"
-        ],
+        "nixvim-upstream": "nixvim-upstream",
         "pre-commit-hooks": [
           "pre-commit-hooks"
         ]
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-JDk6H9sai7DXak4ok8qXDZDC76/ytlF+YNaYhGnntu4=",
+        "narHash": "sha256-YphydUmSAy73Kb6166ZNQDosP3aKbRZ196zPda++6U4=",
         "path": "./programs/nixvim",
         "type": "path"
       },
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/flake.nix b/build/nixos/unmanaged/laptop-framework/flakes/home/flake.nix
index 099466be..747dc31d 100644
--- a/build/nixos/unmanaged/laptop-framework/flakes/home/flake.nix
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/flake.nix
@@ -41,17 +41,18 @@
       inputs.flake-compat.follows = "flake-compat";
       inputs.neovim-flake.follows = "neovim-flake";
     };
-
+    /*
     nixvim = {
       # url = "github:nix-community/nixvim";
       url = "github:developing-today-forks/nixvim-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    */
     vim = {
       url = "path:./programs/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
-      inputs.nixvim-upstream.follows = "nixvim";
+      #       inputs.nixvim-upstream.follows = "nixvim";
       inputs.beautysh.follows = "beautysh";
       inputs.pre-commit-hooks.follows = "pre-commit-hooks";
       inputs.flake-parts.follows = "flake-parts";
@@ -83,13 +84,15 @@
   } @ inputs: let
     system = "x86_64-linux";
   in {
-    homeManagerNixOsModules = stateVersion: [
+    homeManagerNixosModules = stateVersion: [
       ({pkgs, ...}: {
         imports = [
           home-manager.nixosModules.home-manager
           vim.nixosModules.${system}
         ];
-        programs.nixvim.enable = true; # todo: figure out how to put this inside user.
+        programs.nixvim = {
+          enable = true; # todo: figure out how to put this inside user.
+        };
         home-manager.users.user = import ./users/user.nix {inherit stateVersion pkgs;};
       })
     ];
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/config/default.nix b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/config/default.nix
index f9a64549..fadc9bf0 100644
--- a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/config/default.nix
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/config/default.nix
@@ -2,5 +2,6 @@
   # Import all your configuration modules here
   imports = [
     ./bufferline.nix
+    ./lightline.nix
   ];
 }
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.lock b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.lock
index 9fa951d1..1e1e9f27 100644
--- a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.lock
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.lock
@@ -22,6 +22,42 @@
         "type": "github"
       }
     },
+    "final-nixpkgs": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "hercules-ci-agent": "hercules-ci-agent",
+        "hercules-ci-effects": [
+          "hercules-ci-effects"
+        ],
+        "neovim-flake": [
+          "neovim-flake"
+        ],
+        "neovim-nightly-overlay": [
+          "neovim-nightly-overlay"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1,
+        "narHash": "sha256-yYcrbWsJgptQlqoji9v1P05XYyyD4VxgDDQaa2xAyJ4=",
+        "path": "./pkgs",
+        "type": "path"
+      },
+      "original": {
+        "path": "./pkgs",
+        "type": "path"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -146,12 +182,54 @@
         "type": "github"
       }
     },
+    "haskell-flake_2": {
+      "locked": {
+        "lastModified": 1684780604,
+        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
+        "owner": "srid",
+        "repo": "haskell-flake",
+        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "ref": "0.3.0",
+        "repo": "haskell-flake",
+        "type": "github"
+      }
+    },
     "hercules-ci-agent": {
       "inputs": {
         "flake-parts": [
+          "final-nixpkgs",
           "flake-parts"
         ],
         "haskell-flake": "haskell-flake",
+        "nixpkgs": [
+          "final-nixpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693397971,
+        "narHash": "sha256-P5PQ8KzK/SXvEsw+AzG7OBUgnGhuUzKETNHhqVokc+0=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "rev": "344b8b1079731a8c1e144119174f684fb492e03a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "type": "github"
+      }
+    },
+    "hercules-ci-agent_2": {
+      "inputs": {
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "haskell-flake": "haskell-flake_2",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -207,11 +285,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1696187451,
-        "narHash": "sha256-AiGMtsPP6DiCgBjHJSPlr49+Oov2WdTDPd+ffZgkT5o=",
+        "lastModified": 1696214733,
+        "narHash": "sha256-2IqDjWfqhy7MbCbFs3GDRYIpfK2usL+CYGfh6uskK/0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "9ce1623837a817c3f4f5deff9c8ba862578b6009",
+        "rev": "09a17f91d0d362c6e58bfdbe3ccdeacffb0b44b9",
         "type": "github"
       },
       "original": {
@@ -292,7 +370,7 @@
           "flake-utils"
         ],
         "nixpkgs": [
-          "nixpkgs"
+          "final-nixpkgs"
         ],
         "pre-commit-hooks": [
           "pre-commit-hooks"
@@ -301,14 +379,14 @@
       "locked": {
         "lastModified": 1696176774,
         "narHash": "sha256-v8wBRXh3Xxu21pz5KPA50w445ghGO0OSPnM/13xvNy4=",
-        "owner": "developing-today-forks",
-        "repo": "nixvim-flake",
+        "owner": "nix-community",
+        "repo": "nixvim",
         "rev": "47b72e41dde4bd1ca89c6852f20d2818587342d4",
         "type": "github"
       },
       "original": {
-        "owner": "developing-today-forks",
-        "repo": "nixvim-flake",
+        "owner": "nix-community",
+        "repo": "nixvim",
         "type": "github"
       }
     },
@@ -364,10 +442,11 @@
     "root": {
       "inputs": {
         "beautysh": "beautysh",
+        "final-nixpkgs": "final-nixpkgs",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
-        "hercules-ci-agent": "hercules-ci-agent",
+        "hercules-ci-agent": "hercules-ci-agent_2",
         "hercules-ci-effects": "hercules-ci-effects",
         "neovim-flake": "neovim-flake",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.nix b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.nix
index 55bd7d2f..57f29fb8 100644
--- a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.nix
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/flake.nix
@@ -3,9 +3,9 @@
     #     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # /nixos-23.11";
     nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz"; # /nixos-unstable"; # /nixos-23.11";
     nixvim-upstream = {
-      # url = "github:nix-community/nixvim";
-      url = "github:developing-today-forks/nixvim-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/nixvim";
+      #       url = "github:developing-today-forks/nixvim-flake";
+      inputs.nixpkgs.follows = "final-nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
       inputs.beautysh.follows = "beautysh";
       inputs.pre-commit-hooks.follows = "pre-commit-hooks";
@@ -44,6 +44,16 @@
       inputs.flake-compat.follows = "flake-compat";
       inputs.neovim-flake.follows = "neovim-flake";
     }; # need to actually use this
+    final-nixpkgs = {
+      url = "path:./pkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.hercules-ci-effects.follows = "hercules-ci-effects";
+      inputs.flake-compat.follows = "flake-compat";
+      inputs.neovim-flake.follows = "neovim-flake";
+      inputs.neovim-nightly-overlay.follows = "neovim-nightly-overlay";
+    };
 
     beautysh = {
       url = "github:lovesegfault/beautysh";
@@ -58,20 +68,15 @@
     };
   };
   outputs = {
-    nixpkgs,
+    final-nixpkgs,
     nixvim-upstream,
     flake-utils,
-    neovim-nightly-overlay,
     ...
   } @ inputs: let
     config = import ./config;
   in
     flake-utils.lib.eachDefaultSystem (system: let
-      overlay = inputs.neovim-nightly-overlay.overlay;
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [overlay];
-      };
+      pkgs = final-nixpkgs.legacyPackages.${system};
       nixvimLib = nixvim-upstream.lib.${system};
       nixvim = nixvim-upstream.legacyPackages.${system};
       nvim = nixvim.makeNixvimWithModule {
@@ -79,12 +84,10 @@
         module = config;
       };
       nixosModules = nixvim-upstream.nixosModules.nixvim;
-      homeManagerModules = nixvim-upstream.homeManagerModules.nixvim;
     in {
       packages = {
         default = nvim;
       };
       nixosModules = nixosModules;
-      homeManagerModules = homeManagerModules;
     });
 }
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/flake.lock b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/flake.lock
new file mode 100644
index 00000000..81017c0b
--- /dev/null
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/flake.lock
@@ -0,0 +1,223 @@
+{
+  "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696203690,
+        "narHash": "sha256-774XMEL7VHSTLDYVkqrbl5GCdmkVKsjMs+KLM4N4t7k=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "21928e6758af0a258002647d14363d5ffc85545b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "revCount": 87,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.87%2Brev-ff7b65b44d01cf9ba6a71320833626af21126384/018a8a74-649b-792e-a959-2f97793b1129/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/numtide/flake-utils/%2A.tar.gz"
+      }
+    },
+    "haskell-flake": {
+      "locked": {
+        "lastModified": 1684780604,
+        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
+        "owner": "srid",
+        "repo": "haskell-flake",
+        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "ref": "0.3.0",
+        "repo": "haskell-flake",
+        "type": "github"
+      }
+    },
+    "hercules-ci-agent": {
+      "inputs": {
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "haskell-flake": "haskell-flake",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693397971,
+        "narHash": "sha256-P5PQ8KzK/SXvEsw+AzG7OBUgnGhuUzKETNHhqVokc+0=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "rev": "344b8b1079731a8c1e144119174f684fb492e03a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-agent",
+        "type": "github"
+      }
+    },
+    "hercules-ci-effects": {
+      "inputs": {
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "hercules-ci-agent": [
+          "hercules-ci-agent"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1695684520,
+        "narHash": "sha256-yORqGB0i1OtEf9MOCCT2BIbOd8txPZn216CM+ylMmhY=",
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "rev": "91fae5824f5f1199f61693c6590b4a89abaed9d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "hercules-ci-effects",
+        "type": "github"
+      }
+    },
+    "neovim-flake": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "contrib",
+        "lastModified": 1696214733,
+        "narHash": "sha256-2IqDjWfqhy7MbCbFs3GDRYIpfK2usL+CYGfh6uskK/0=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "09a17f91d0d362c6e58bfdbe3ccdeacffb0b44b9",
+        "type": "github"
+      },
+      "original": {
+        "dir": "contrib",
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
+    "neovim-nightly-overlay": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "hercules-ci-effects": [
+          "hercules-ci-effects"
+        ],
+        "neovim-flake": [
+          "neovim-flake"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696205061,
+        "narHash": "sha256-HXUmII41X0fDSQouFa86KWnvGmdipNmF5hIx9hEH9EU=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "de6f29f963bdc8476981f5327b24d441cb2f49eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1696019113,
+        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
+        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
+        "revCount": 530560,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.530560%2Brev-f5892ddac112a1e9b3612c39af1b72987ee5783a/018aec4d-58df-7d2d-a74e-b1bc82c4654f/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "flake-utils": "flake-utils",
+        "hercules-ci-agent": "hercules-ci-agent",
+        "hercules-ci-effects": "hercules-ci-effects",
+        "neovim-flake": "neovim-flake",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/flake.nix b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/flake.nix
new file mode 100644
index 00000000..6fbd0557
--- /dev/null
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/flake.nix
@@ -0,0 +1,74 @@
+{
+  inputs = {
+    #     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # /nixos-23.11";
+    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz"; # /nixos-unstable"; # /nixos-23.11";
+
+    flake-utils.url = "https://flakehub.com/f/numtide/flake-utils/*.tar.gz"; #*/ # inputs.systems
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+    neovim-flake = {
+      url = "github:neovim/neovim?dir=contrib";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+    hercules-ci-agent = {
+      url = "github:hercules-ci/hercules-ci-agent";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hercules-ci-effects = {
+      url = "github:hercules-ci/hercules-ci-effects";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.hercules-ci-agent.follows = "hercules-ci-agent";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    neovim-nightly-overlay = {
+      url = "github:nix-community/neovim-nightly-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.hercules-ci-effects.follows = "hercules-ci-effects";
+      inputs.flake-compat.follows = "flake-compat";
+      inputs.neovim-flake.follows = "neovim-flake";
+    };
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    neovim-nightly-overlay,
+    ...
+  }: {
+    legacyPackages.x86_64-linux = let
+      overlay = neovim-nightly-overlay.overlay;
+      pkgs = import nixpkgs {
+        system = "x86_64-linux";
+        overlays = [overlay];
+      };
+    in
+      pkgs;
+
+    legacyPackages.aarch64-linux = let
+      overlay = neovim-nightly-overlay.overlay;
+      pkgs = import nixpkgs {
+        system = "aarch64-linux";
+        overlays = [overlay];
+      };
+    in
+      pkgs;
+
+    # Add more systems if needed
+
+    # Expose library
+    lib = nixpkgs.lib;
+
+    # Expose other top-level attributes as needed
+    checks = {}; # don't skip?
+    htmlDocs = nixpkgs.htmlDocs;
+  };
+}
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/rebuild.sh b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/rebuild.sh
new file mode 100755
index 00000000..8420eb37
--- /dev/null
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/pkgs/rebuild.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Get the directory of the script
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Git add for the script's directory
+cd "${script_dir}" || exit 1
+git add .
+
+# Loop through each directory in config
+for dir in "${script_dir}"/config/*; do
+  if [[ -d ${dir} ]]; then
+    # Skip the directory if it doesn't contain a flake.nix file
+    if [[ ! -f "${dir}/flake.nix" ]]; then
+      continue
+    fi
+    cd "${dir}" || exit 1
+    # If a rebuild script exists, execute it
+    if [[ -f "./rebuild.sh" ]]; then
+      chmod +x ./rebuild.sh
+      ./rebuild.sh
+    fi
+    nix flake update --show-trace
+    nix flake check --show-trace
+    #     nix build .
+    cd "${script_dir}" || exit 1
+  fi
+done
+
+git add .
+nix flake update --show-trace
+nix flake check --show-trace
+git add .
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/rebuild.sh b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/rebuild.sh
index 6809477d..34113457 100755
--- a/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/rebuild.sh
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/programs/nixvim/rebuild.sh
@@ -8,7 +8,6 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "${script_dir}" || exit 1
 git add .
 
-# Loop through each directory in config
 for dir in "${script_dir}"/config/*; do
   if [[ -d ${dir} ]]; then
     # Skip the directory if it doesn't contain a flake.nix file
@@ -21,12 +20,34 @@ for dir in "${script_dir}"/config/*; do
       chmod +x ./rebuild.sh
       ./rebuild.sh
     fi
-    nix flake update
-    nix build .
+    nix flake update --show-trace
+    nix flake check --show-trace
+    cd "${script_dir}" || exit 1
+  fi
+done
+
+# Loop through each directory in config
+for dir in "${script_dir}"/*; do
+  if [[ -d ${dir} ]]; then
+    # Skip the directory if it doesn't contain a flake.nix file
+    if [[ ! -f "${dir}/flake.nix" ]]; then
+      continue
+    fi
+    cd "${dir}" || exit 1
+    # If a rebuild script exists, execute it
+    if [[ -f "./rebuild.sh" ]]; then
+      chmod +x ./rebuild.sh
+      ./rebuild.sh
+    fi
+    nix flake update --show-trace
+    nix flake check --show-trace
+
     cd "${script_dir}" || exit 1
   fi
 done
 
 git add .
-nix flake update
+nix flake update --show-trace
+nix flake check --show-trace
+nix build . --show-trace
 git add .
diff --git a/build/nixos/unmanaged/laptop-framework/flakes/home/rebuild.sh b/build/nixos/unmanaged/laptop-framework/flakes/home/rebuild.sh
index 7d6f5e42..c43aeb04 100755
--- a/build/nixos/unmanaged/laptop-framework/flakes/home/rebuild.sh
+++ b/build/nixos/unmanaged/laptop-framework/flakes/home/rebuild.sh
@@ -21,11 +21,13 @@ for dir in "${script_dir}"/programs/*; do
       chmod +x ./rebuild.sh
       ./rebuild.sh
     fi
-    nix flake update
+    nix flake update --show-trace
+    nix flake check --show-trace
     cd "${script_dir}" || exit 1
   fi
 done
 
 git add .
-nix flake update
+nix flake update --show-trace
+nix flake check --show-trace
 git add .
diff --git a/build/nixos/unmanaged/laptop-framework/rebuild.sh b/build/nixos/unmanaged/laptop-framework/rebuild.sh
index 4906d9cc..e75a8304 100755
--- a/build/nixos/unmanaged/laptop-framework/rebuild.sh
+++ b/build/nixos/unmanaged/laptop-framework/rebuild.sh
@@ -17,12 +17,14 @@ for dir in "${script_dir}"/flakes/*; do
       chmod +x ./rebuild.sh
       ./rebuild.sh
     fi
-    nix flake update
+    nix flake update --show-trace
+    nix flake check --show-trace
     cd "${script_dir}" || exit 1
   fi
 done
 
 git add .
-nix flake update
+nix flake update --show-trace
+nix flake check --show-trace
 git add .
 sudo nixos-rebuild switch