diff --git a/flake.lock b/flake.lock
index 7d95745..8713481 100644
--- a/flake.lock
+++ b/flake.lock
@@ -638,14 +638,19 @@
         "nvf": "nvf"
       },
       "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-m1itEjykrVXFp6BlxlVKtLRMIBHISlNhdRjyFC8P22g=",
-        "path": "nixos/modules/neovim",
-        "type": "path"
+        "dir": "nixos/modules/neovim",
+        "lastModified": 1736202585,
+        "narHash": "sha256-1GCCwcb7Zf/dUCRBw8OLKGcvN5qypAHqkJdcBf5ANpA=",
+        "owner": "kylekrein",
+        "repo": "nixos-config",
+        "rev": "b66cb9f49d20914e0ca1aea0e0ee109790c47e17",
+        "type": "github"
       },
       "original": {
-        "path": "nixos/modules/neovim",
-        "type": "path"
+        "dir": "nixos/modules/neovim",
+        "owner": "kylekrein",
+        "repo": "nixos-config",
+        "type": "github"
       }
     },
     "nil": {
diff --git a/flake.nix b/flake.nix
index 58bc92e..9c6483d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
       url = "github:nixos/nixpkgs?ref=nixos-unstable";
     };
     neovim = {
-      url = "path:nixos/modules/neovim";
+      url = "github:kylekrein/nixos-config?dir=nixos/modules/neovim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "github:hyprwm/Hyprland";
@@ -75,7 +75,10 @@
     };
     darwinConfigurations = {
       "kylekrein-air" = inputs.nix-darwin.lib.darwinSystem {
-        specialArgs = {inherit self;};
+        specialArgs = {
+          inherit self;
+          inherit inputs;
+        };
         modules = [./nixos/hosts/kylekrein-air];
       };
     };
diff --git a/nixos/hosts/kylekrein-air/default.nix b/nixos/hosts/kylekrein-air/default.nix
index 9210120..5749fbf 100644
--- a/nixos/hosts/kylekrein-air/default.nix
+++ b/nixos/hosts/kylekrein-air/default.nix
@@ -1,25 +1,31 @@
-{ self, pkgs, ... }: {
-      # List packages installed in system profile. To search by name, run:
-      # $ nix-env -qaP | grep wget
-      environment.systemPackages = with pkgs;[ 
-	neovim
-	kitty
-	yazi
-        ];
+{
+  self,
+  pkgs,
+  inputs,
+  ...
+}: {
+  # List packages installed in system profile. To search by name, run:
+  # $ nix-env -qaP | grep wget
+  environment.systemPackages = with pkgs; [
+    neovim
+    kitty
+    yazi
+    inputs.neovim.packages.${pkgs.system}.default
+  ];
 
-      # Necessary for using flakes on this system.
-      nix.settings.experimental-features = "nix-command flakes";
+  # Necessary for using flakes on this system.
+  nix.settings.experimental-features = "nix-command flakes";
 
-      # Enable alternative shell support in nix-darwin.
-      # programs.fish.enable = true;
+  # Enable alternative shell support in nix-darwin.
+  # programs.fish.enable = true;
 
-      # Set Git commit hash for darwin-version.
-      system.configurationRevision = self.rev or self.dirtyRev or null;
+  # Set Git commit hash for darwin-version.
+  system.configurationRevision = self.rev or self.dirtyRev or null;
 
-      # Used for backwards compatibility, please read the changelog before changing.
-      # $ darwin-rebuild changelog
-      system.stateVersion = 5;
+  # Used for backwards compatibility, please read the changelog before changing.
+  # $ darwin-rebuild changelog
+  system.stateVersion = 5;
 
-      # The platform the configuration will be used on.
-      nixpkgs.hostPlatform = "aarch64-darwin";
+  # The platform the configuration will be used on.
+  nixpkgs.hostPlatform = "aarch64-darwin";
 }
diff --git a/nixos/modules/neovim/nvf-configuration.nix b/nixos/modules/neovim/nvf-configuration.nix
index f970fa9..a8f9b26 100644
--- a/nixos/modules/neovim/nvf-configuration.nix
+++ b/nixos/modules/neovim/nvf-configuration.nix
@@ -7,8 +7,8 @@
     spellcheck.enable = true;
     viAlias = true;
     vimAlias = true;
-    shiftwidth = 4;
-    tabstop = 4;
+    shiftwidth = 16;
+    tabstop = 16;
     useSystemClipboard = true;
     lineNumberMode = "number";