[Nix] Cleans up linux host root [neovim] Renames buffer picker

system/hosts/drew-desktop/default.nix

@@ -1,33 +1,27 @@
-{ self, nixpkgs, inputs, ... }:
-let
+{ nixpkgs, inputs, ... }:
+nixpkgs.lib.nixosSystem {
   system = "x86_64-linux";
-    # TODO: Fix this so it doesn't warn about wanting readOnlyPkgs
-    pkgs = import nixpkgs {
-      inherit system;
-      config.allowUnfree = true;
-    };
-in nixpkgs.lib.nixosSystem {
-  inherit system;
   modules = [
     ./configuration.nix
     ./hardware-configuration.nix
     inputs.home-manager.nixosModules.home-manager
     {
-      home-manager.users.drew = { pkgs, inputs, ... }:
+      nixpkgs.config.allowUnfree = true;
+      home-manager.users.drew =
+        { ... }:
         {
           imports = [
             ./drew.nix
           ];
         };
       home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
       home-manager.extraSpecialArgs = {
-          inherit inputs;
-          inherit pkgs;
-        };
+        inherit inputs;
+      };
     }
   ];
   specialArgs = {
     inherit inputs;
-    inherit pkgs;
   };
 }

system/hosts/drew-desktop/drew.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, self, ... }:
+{ pkgs, ... }:
 {
   imports = map (x: ../../../home-manager + x) [
     "/features/linux-desktop.nix"