diff --git a/flake.nix b/flake.nix
index 7bbcb66..fbf14d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,10 +60,8 @@
 
   };
 
-  outputs = { self, home-manager, nixpkgs, unstable, deploy-rs, sops-nix, nixos-apple-silicon, ... }@inputs:
+  outputs = { self, nixpkgs, deploy-rs, ... }@inputs:
     let
-      pkgs = import nixpkgs { system = "x86_64-linux"; };
-      pkgsrpi = import nixpkgs { system = "aarch64-linux"; };
       lib = nixpkgs.lib.extend (import ./lib inputs);
       machines_plats = lib.mapAttrsToList (name: value: value.arch) lib.luj.machines;
 
@@ -74,7 +72,6 @@
         })
         machines_plats);
     in
-    with lib;
     rec {
       nixosModules = builtins.listToAttrs (map
         (x: {
diff --git a/home-manager-modules/neovim/default.nix b/home-manager-modules/neovim/default.nix
index fc1daf1..fec540f 100644
--- a/home-manager-modules/neovim/default.nix
+++ b/home-manager-modules/neovim/default.nix
@@ -40,10 +40,14 @@ with lib;
               };
 
               nix = {
-                command = "rnix-lsp";
-                filetypes = [
-                  "nix"
-                ];
+                command = "nil";
+                filetypes = [ "nix" ];
+                rootPatterns = [ "flake.nix" ];
+                settings = {
+                  nil = {
+                    formatting = { command = [ "nixpkgs-fmt" ]; };
+                  };
+                };
               };
             };
         };
@@ -51,9 +55,6 @@ with lib;
 
       withPython3 = true;
       plugins = with pkgs.vimPlugins; [
-        # LSP
-        nvim-lspconfig
-
         plenary-nvim
 
         #Telescope
@@ -90,7 +91,7 @@ with lib;
         rust-vim
       ];
 
-      extraPackages = with pkgs; [ rust-analyzer rnix-lsp pyright haskell-language-server ];
+      extraPackages = with pkgs; [ rust-analyzer pkgs.unstable.nil pyright haskell-language-server nixpkgs-fmt ];
 
       extraConfig = ''
         luafile ${./settings.lua}