diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix
index 2e98ee4..f390328 100644
--- a/flake-modules/nixos-modules.nix
+++ b/flake-modules/nixos-modules.nix
@@ -2,17 +2,10 @@
 {
   flake.nixosModules =
     let
-      nvim-config =
-        { pkgs, ... }:
-        {
-          imports = [
-            inputs.nixvim.homeManagerModules.nixvim
-            (import ../nvim {
-              inherit (inputs) unstable;
-              inherit (pkgs) system;
-            })
-          ];
-        };
+      nvim-config.imports = [
+        inputs.nixvim.homeManagerModules.nixvim
+        ../nvim
+      ];
       homeManagerModuleSandalone = import ../home {
         inherit nvim-config;
         inherit (inputs) stylix;
diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix
index 00aadc3..a143ff1 100644
--- a/flake-modules/nvim.nix
+++ b/flake-modules/nvim.nix
@@ -9,11 +9,7 @@
       nixvim = inputs.nixvim.legacyPackages.${system};
       module = {
         inherit pkgs;
-        extraSpecialArgs = {
-          inherit (inputs) unstable;
-          inherit system;
-        };
-        module = import ../nvim/standalone.nix { standalone = true; };
+        module = ../nvim/standalone.nix;
       };
     in
     {
diff --git a/flake-modules/overlays.nix b/flake-modules/overlays.nix
index 437797c..62e46dd 100644
--- a/flake-modules/overlays.nix
+++ b/flake-modules/overlays.nix
@@ -17,6 +17,8 @@
       inherit (unstablePkgs)
         gitoxide
         jujutsu
+        neovim-unwrapped
+        ruff # nixpkgs stable version is improperly configured by nixvim
         # wezterm
         ;
     };
diff --git a/nvim/default.nix b/nvim/default.nix
index ce16984..3e304dd 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -1,4 +1,3 @@
-{ system, unstable }:
 { lib, config, ... }:
 let
   cfg = config.jhome.nvim;
@@ -7,9 +6,8 @@ in
   imports = [ ./options.nix ];
 
   config.programs.nixvim = lib.mkMerge [
-    (import ./standalone.nix { standalone = false; })
+    ./standalone.nix
     (lib.mkIf cfg.enable {
-      nixpkgs = lib.mkForce { pkgs = import unstable { inherit system; }; };
       enable = true;
       defaultEditor = lib.mkDefault true;
     })
diff --git a/nvim/plugins.nix b/nvim/plugins.nix
index 7e5f818..3c2f67d 100644
--- a/nvim/plugins.nix
+++ b/nvim/plugins.nix
@@ -183,7 +183,7 @@ in
       servers = {
         bashls = {
           enable = true;
-          package = pkgs.bash-language-server;
+          package = pkgs.unstable.bash-language-server;
         };
         # clangd.enable = true; # Adds ~2GiB
         # html.enable = true; # Not writing html
diff --git a/nvim/standalone.nix b/nvim/standalone.nix
index cc48d20..b5f13e8 100644
--- a/nvim/standalone.nix
+++ b/nvim/standalone.nix
@@ -1,11 +1,4 @@
-{ standalone }:
-{
-  pkgs,
-  system,
-  unstable,
-  lib,
-  ...
-}:
+{ pkgs, ... }:
 {
   imports = [
     ./options.nix
@@ -15,7 +8,6 @@
   ];
 
   config = {
-    nixpkgs = lib.optionalAttrs standalone { pkgs = import unstable { inherit system; }; };
     globals.mapleader = " ";
     # Appearance
     colorschemes.gruvbox = {
@@ -50,8 +42,8 @@
     };
     extraPlugins =
       let
-        plugins = pkgs.vimPlugins;
-        extraPlugins = import ./extraPlugins { inherit pkgs; };
+        plugins = pkgs.unstable.vimPlugins;
+        extraPlugins = import ./extraPlugins { pkgs = pkgs.unstable; };
       in
       [
         plugins.nui-nvim
@@ -61,15 +53,15 @@
       ];
     # Formatting & linters
     extraPackages = [
-      pkgs.luajitPackages.jsregexp
-      pkgs.shfmt
-      pkgs.silicon
-      pkgs.statix
-      pkgs.stylua
-      pkgs.taplo
-      pkgs.typos
-      pkgs.yamlfmt
-      (pkgs.python3.withPackages (p: [ p.jupytext ]))
+      pkgs.unstable.luajitPackages.jsregexp
+      pkgs.unstable.shfmt
+      pkgs.unstable.silicon
+      pkgs.unstable.statix
+      pkgs.unstable.stylua
+      pkgs.unstable.taplo
+      pkgs.unstable.typos
+      pkgs.unstable.yamlfmt
+      (pkgs.unstable.python3.withPackages (p: [ p.jupytext ]))
     ];
     extraConfigLuaPre =
       # lua