diff --git a/common/gui.nix b/common/gui.nix
index 30c6a1ec..fd5fd3d6 100644
--- a/common/gui.nix
+++ b/common/gui.nix
@@ -7,7 +7,7 @@
 lib.attrsets.optionalAttrs device.hasGui {
   home.packages = with pkgs;
     [
-      neovide
+      # neovide
     ]
     ++ lib.optionals device.isLinux [
       bottles
diff --git a/darwin/configuration.nix b/darwin/configuration.nix
index 9819f4f9..c6d270b1 100644
--- a/darwin/configuration.nix
+++ b/darwin/configuration.nix
@@ -1,10 +1,10 @@
 {pkgs, ...}: {
   imports = [./yabai.nix ./skhd.nix];
 
-  environment.systemPackages = with pkgs; [nix neovim];
+  # environment.systemPackages = with pkgs; [nix neovim];
   nix = {
     settings = {
-      experimental-features = "nix-command flakes repl-flake auto-allocate-uids";
+      experimental-features = "nix-command flakes auto-allocate-uids";
       max-jobs = 8;
       trusted-users = ["root" "fs0c131y"];
     };
@@ -12,7 +12,7 @@
       build-users-group = nixbld
       extra-nix-path = nixpkgs=flake:nixpkgs
     '';
-    # package = pkgs.nixVersions.nix_2_21;
+    package = pkgs.nixVersions.latest;
   };
 
   # security.pam.enableSudoTouchIdAuth = true;
diff --git a/flake.lock b/flake.lock
index ec2a9b40..2e9acf84 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1109,6 +1109,33 @@
       }
     },
     "git-hooks_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_8",
+        "gitignore": "gitignore_4",
+        "nixpkgs": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716213921,
+        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "git-hooks_3": {
       "inputs": {
         "flake-compat": "flake-compat_10",
         "gitignore": "gitignore_5",
@@ -1207,7 +1234,7 @@
       "inputs": {
         "nixpkgs": [
           "neovim-nightly-overlay",
-          "pre-commit-hooks",
+          "git-hooks",
           "nixpkgs"
         ]
       },
@@ -1315,11 +1342,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716736760,
-        "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
+        "lastModified": 1716847642,
+        "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
+        "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa",
         "type": "github"
       },
       "original": {
@@ -1577,7 +1604,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-v+dciXEHoCPaqy5ZI9aA8YzAK3CLPV0PSsfdae4AInY=",
+        "narHash": "sha256-jAcLbG2bZ7FxNMYTSPyT7G2kfLa26nW5LXZiMNWxfrY=",
         "path": "./neovim",
         "type": "path"
       },
@@ -1590,19 +1617,19 @@
       "inputs": {
         "flake-compat": "flake-compat_7",
         "flake-parts": "flake-parts_8",
+        "git-hooks": "git-hooks_2",
         "hercules-ci-effects": "hercules-ci-effects_2",
         "neovim-src": "neovim-src_2",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "pre-commit-hooks": "pre-commit-hooks_2"
+        ]
       },
       "locked": {
-        "lastModified": 1716760058,
-        "narHash": "sha256-5fMMNezTARjbc8HgEkvcOazlrsBBzlKSMVp56xTCY2g=",
+        "lastModified": 1716827514,
+        "narHash": "sha256-5qS9Jn3FaEFMGGhS/1mLOUifMFDLPcLczjcdaN7xgyE=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "0c1fc48841eda5e35402327b1a71f4bb034a012c",
+        "rev": "7849e018a09688cd71bde887113954b3ce08739c",
         "type": "github"
       },
       "original": {
@@ -1937,11 +1964,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1716814660,
-        "narHash": "sha256-lDy4PXkwQs3qBxVCdwOcNDJbWBCMJcoGfsHnr3U3Okg=",
+        "lastModified": 1716833970,
+        "narHash": "sha256-K3tVrTna4EN86GW9IeOQJkbj57zT2xNGJg1hh26xy5c=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "4175fac0ea144679b9818bfc3c7becfbd68e25a4",
+        "rev": "a2afa5634495ee739e682e5ccb743c5c6dd90ec1",
         "type": "github"
       },
       "original": {
@@ -1956,7 +1983,7 @@
         "flake-compat": "flake-compat_9",
         "flake-parts": "flake-parts_10",
         "flake-root": "flake-root_2",
-        "git-hooks": "git-hooks_2",
+        "git-hooks": "git-hooks_3",
         "home-manager": "home-manager_3",
         "nix-darwin": "nix-darwin_3",
         "nixpkgs": [
@@ -1965,11 +1992,11 @@
         "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
-        "lastModified": 1716814660,
-        "narHash": "sha256-lDy4PXkwQs3qBxVCdwOcNDJbWBCMJcoGfsHnr3U3Okg=",
+        "lastModified": 1716833970,
+        "narHash": "sha256-K3tVrTna4EN86GW9IeOQJkbj57zT2xNGJg1hh26xy5c=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "4175fac0ea144679b9818bfc3c7becfbd68e25a4",
+        "rev": "a2afa5634495ee739e682e5ccb743c5c6dd90ec1",
         "type": "github"
       },
       "original": {
@@ -2006,11 +2033,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1716814210,
-        "narHash": "sha256-/8p5Gb0B+wP+cvvd3IsyT/MyKjMtdoX+lb9gPwxaPlw=",
+        "lastModified": 1716903916,
+        "narHash": "sha256-kjodJgHDprBBwQ7WHRPaTtJ4cgxHKycquhwO9tlWcjI=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "8033337d0222adb3bbd4482f05958c0a334985c8",
+        "rev": "f90c0edd68fd388dfbaa310789a13bccfd06b005",
         "type": "github"
       },
       "original": {
@@ -2127,33 +2154,6 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks_2": {
-      "inputs": {
-        "flake-compat": "flake-compat_8",
-        "gitignore": "gitignore_4",
-        "nixpkgs": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "neovim-nightly-overlay",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1716213921,
-        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "rest-nvim": {
       "flake": false,
       "locked": {
@@ -2317,11 +2317,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716776264,
-        "narHash": "sha256-fYzMk5o//g5Wt1g0FyOC8/XVllbGdVdzdylXxcanakU=",
+        "lastModified": 1716862669,
+        "narHash": "sha256-7oTPM9lcdwiI1cpRC313B+lHawocgpY5F07N+Rbm5Uk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8ef3f6a8f5af867ab5f75fc86fbd934a6351820b",
+        "rev": "47b2d15658b37716393b2463a019000dbd6ce4bc",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 027f1881..f172d406 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,7 +92,6 @@
     flake-utils,
     anyrun,
     nur,
-    neovim-nightly-overlay,
     ...
   } @ inputs: let
     config_devices = [
diff --git a/neovim/flake.lock b/neovim/flake.lock
index 72503b8b..0135894c 100644
--- a/neovim/flake.lock
+++ b/neovim/flake.lock
@@ -196,38 +196,11 @@
         "type": "github"
       }
     },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1716213921,
-        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
           "nixvim",
-          "git-hooks",
+          "pre-commit-hooks",
           "nixpkgs"
         ]
       },
@@ -435,25 +408,26 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-root": "flake-root",
-        "git-hooks": "git-hooks",
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nixpkgs": [
           "nixpkgs"
         ],
+        "pre-commit-hooks": "pre-commit-hooks",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1716814660,
-        "narHash": "sha256-lDy4PXkwQs3qBxVCdwOcNDJbWBCMJcoGfsHnr3U3Okg=",
+        "lastModified": 1716326274,
+        "narHash": "sha256-1LyTvpjb8Cmlg3TRnP56rvqK1WSNa518pD6F0tjgM+U=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "4175fac0ea144679b9818bfc3c7becfbd68e25a4",
+        "rev": "5d2e01495944dcf7cf7ee53a7074c4010165d756",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "nixvim",
+        "rev": "5d2e01495944dcf7cf7ee53a7074c4010165d756",
         "type": "github"
       }
     },
@@ -466,7 +440,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks": "pre-commit-hooks"
+        "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
         "lastModified": 1716760058,
@@ -515,6 +489,33 @@
       }
     },
     "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1716213921,
+        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks_2": {
       "inputs": {
         "flake-compat": "flake-compat_4",
         "gitignore": "gitignore_2",
diff --git a/neovim/nvim.nix b/neovim/nvim.nix
index d9d878f9..af25d7b3 100644
--- a/neovim/nvim.nix
+++ b/neovim/nvim.nix
@@ -10,9 +10,8 @@
     pkgs.lib.mapAttrsToList
     (key: value: {
       key = key;
-      action = value;
+      action = rawLua value;
       mode = mode;
-      lua = true;
     })
     mappings;
   border = ["╭" "─" "╮" "│" "╯" "─" "╰" "│"];
@@ -647,7 +646,8 @@ in rec {
         })
 
       '';
-    package = pkgs.neovim;
+    # package = pkgs.neovim-unwrapped;
+    # pkgs.neovim;
     opts = {
       shell = "sh";
       number = true;
diff --git a/neovim/overlays.nix b/neovim/overlays.nix
index 685c1304..474ee1e2 100644
--- a/neovim/overlays.nix
+++ b/neovim/overlays.nix
@@ -144,7 +144,7 @@
   #   # rest-nvim = final.vimPlugins.rest-nvim;
   # };
 in [
-  inputs.nnn.overlays.default
+  # inputs.nnn.overlays.default
   inputs.nixvim.overlays.default
   vimPlugins
   tree-sitter-grammars
diff --git a/overlays.nix b/overlays.nix
index d34ba75e..b6357d6d 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -210,7 +210,7 @@ in [
   nix-index-db
   shell-scipts
   misc-applications
-  inputs.neovim-nightly-overlay.overlays.default
+  # inputs.neovim-nightly-overlay.overlays.default
   inputs.nixvim.overlays.default
   inputs.nur.overlay
   inputs.neovim.overlays.default