Refactor everything to make usage easier with

mutiple systems, also merge all abstractions
to avoid huge desctructions in the attrset input.

lib/configuration.nix

@@ -0,0 +1,29 @@
+rec {
+  systemConfiguration = configuration: configuration;
+
+  systemPackages = packages: systemConfiguration {
+    environment.systemPackages = packages;
+  };
+
+  systemFonts = packages: systemConfiguration {
+    fonts.packages = packages;
+  };
+
+  userHomeConfiguration = users: configuration: {
+    home-manager.users = builtins.foldl' (final: user: final // {
+      ${user} = configuration;
+    }) {} (if builtins.isList users then users else [ users ]);
+  };
+
+  # FIXME: Don't hardcode these.
+  graphicalConfiguration = userHomeConfiguration "nixos";
+  graphicalPackages      = packages: graphicalConfiguration {
+    home.packages = packages;
+  };
+
+  # FIXME: Don't hardcode these.
+  homeConfiguration = userHomeConfiguration [ "nixos" "root" ];
+  homePackages      = packages: homeConfiguration {
+    home.packages = packages;
+  };
+}

lib/default.nix

@@ -0,0 +1,9 @@
+lib:
+
+(import ./configuration.nix)
+//
+(import ./merge.nix lib)
+//
+(import ./modules.nix)
+//
+(import ./values.nix)

lib/merge.nix

@@ -0,0 +1,8 @@
+lib:
+
+rec {
+  merge = lib.recursiveUpdate;
+  merge3 = x: y: merge (merge x y);
+  merge4 = x: y: merge3 (merge x y);
+  merge5 = x: y: merge4 (merge x y);
+}

lib/modules.nix

@@ -0,0 +1,8 @@
+{
+  importModules = modules: {
+    imports = builtins.map (module: if builtins.isPath module then
+      module
+    else
+      ../modules/${module}) modules;
+  };
+}

lib/values.nix

@@ -0,0 +1,14 @@
+{
+  enabled = attributes: attributes // {
+    enable = true;
+  };
+
+  normalUser = attributes: attributes // {
+    isNormalUser = true;
+  };
+
+  graphicalUser = attributes: attributes // {
+    extraGroups  = [ "graphical" ] ++ (attributes.extraGroups or []);
+    isNormalUser = true;
+  };
+}