host: Refactor a bit

hosts/ayame.nix

@@ -1,12 +1,8 @@
 { config, pkgs, lib, ... }:
 
 let
-  mkHost = import ../modules/host.nix {
+  mkHost = (import ../modules { lib = lib; pkgs = pkgs; }).mkHost;
-    config = config;
+in mkHost config {
-    lib = lib;
-    pkgs = pkgs;
-  };
-in mkHost {
   userName = "alexander";
   hostName = "ayame";
   wireless = true;

hosts/miku.nix

@@ -1,12 +1,8 @@
 { config, lib, pkgs, ... }:
 
 let
-  mkHost = import ../modules/host.nix {
+  mkHost = (import ../modules { lib = lib; pkgs = pkgs; }).mkHost;
-    config = config;
+in mkHost config {
-    lib = lib;
-    pkgs = pkgs;
-  };
-in mkHost {
   userName = "alexander";
   hostName = "miku";
   overlays = [ "nur" "steam" "unstable" "simple" "custom" "emacs" ];

modules/default.nix

@@ -0,0 +1,7 @@
+{
+  lib, pkgs
+}:
+
+{
+  mkHost = import ./host.nix { lib = lib; pkgs = pkgs; };
+}

modules/host.nix

@@ -1,6 +1,8 @@
-{ config, lib, pkgs, ... }:
-
 {
+  lib, pkgs
+}:
+
+config: {
   userName
 , hostName
 , wireless ? false