emergency changes after rebase confusion

Author: NobbZ

packages/default.nix

@@ -54,7 +54,7 @@
           (upkgs.callPackage ./installer {
             inherit (inputs.nixpkgs.lib) nixosSystem;
             inherit npins;
-            inherit (inputs) nixvim;
+            inherit (inputs) nvim;
           })
           .config
           .system

packages/installer/default.nix

@@ -2,15 +2,14 @@
   nixosSystem,
   system,
   npins,
-  nixvim,
+  nvim,
 }:
 nixosSystem {
   inherit system;
 
-  specialArgs = {inherit npins;};
+  specialArgs = {inherit npins nvim;};
 
   modules = [
-    nixvim.nixosModules.nixvim
     ./awesome.nix
     ./base.nix
     ./lvm.nix

packages/installer/neovim.nix

@@ -1,34 +1,5 @@
-{
+{nvim, pkgs, ...}: {
   environment.variables.EDITOR = "nvim";
 
-  programs.nixvim.enable = true;
-
-  programs.nixvim.options = {
-    number = true;
-
-    tabstop = 2;
-    shiftwidth = 2;
-    expandtab = true;
-
-    smartindent = true;
-  };
-
-  programs.nixvim.plugins = {
-    lsp = {
-      enable = true;
-      servers.nil_ls.enable = true;
-    };
-
-    noice = {
-      enable = true;
-    };
-
-    neo-tree = {
-      enable = true;
-    };
-
-    neogit = {
-      enable = true;
-    };
-  };
+  environment.systemPackages = [nvim.packages.${pkgs.system}.neovim];
 }