From fb74112c15cb42634e10ee26597665d5a0dcf04a Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <depasquale+git@giugl.io>
Date: Tue, 14 Feb 2023 21:20:01 +0100
Subject: [PATCH] lib.host: Minor cleanup and formatting

---
 lib/host.nix | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/lib/host.nix b/lib/host.nix
index 72d4e48..4701293 100644
--- a/lib/host.nix
+++ b/lib/host.nix
@@ -1,4 +1,14 @@
-{ pkgs, nixpkgs, nixos-unstable, unstable, home-manager, system, mkHomeRole, mkSysRole, mkUser, ... }:
+{ pkgs
+, nixpkgs
+, nixos-unstable
+, unstable
+, home-manager
+, system
+, mkHomeRole
+, mkSysRole
+, mkUser
+, ...
+}:
 
 {
   mkHost = { name, users, roles ? [ ], imports ? [ ] }:
@@ -22,19 +32,28 @@
             (mkSysRole "common")
             (mkSysRole "acme")
           ];
+
           nixpkgs = { inherit pkgs; };
 
-          nix.nixPath = [ "nixpkgs=${nixpkgs}" "unstable=${nixos-unstable}" ];
-          nix.registry.nixpkgs.flake = nixpkgs;
-          nix.registry.unstable.flake = nixos-unstable;
+          nix = {
+            nixPath = [
+              "nixpkgs=${nixpkgs}"
+              "unstable=${nixos-unstable}"
+            ];
+            registry = {
+              nixpkgs.flake = nixpkgs;
+              unstable.flake = nixos-unstable;
+            };
+          };
 
           users.users.root = { shell = pkgs.zsh; };
 
           home-manager = {
-            users.root.imports = [ (mkHomeRole "common") ];
+            users.root.imports = pkgs.lib.singleton (mkHomeRole "common");
             extraSpecialArgs.unstable = unstable;
             useGlobalPkgs = true;
           };
+
           system.stateVersion = "22.11";
         }