refactor(tazjin/nixos): Automatically include home config r/4046

Adds a small module that automatically picks the right home
configuration for each machine.

For some reason, importing home-manager itself in this module causes
infinite recursion. I've not looked into why, and left the import in
the tverskoy config instead.

Change-Id: Ie27109a3c4478b198ab646b2e179999cf053980e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5552
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: tazjin <tazjin@tvl.su>

2 files changed, 23 insertions, 17 deletions

diff --git a/users/tazjin/nixos/modules/home-config.nix b/users/tazjin/nixos/modules/home-config.nix
new file mode 100644
index 0000000000..2445afbb52
--- /dev/null
+++ b/users/tazjin/nixos/modules/home-config.nix
@@ -0,0 +1,21 @@
+# Inject the right home-manager config for the machine.
+
+{ config, depot, pkgs, ... }:
+
+{
+  users.users.tazjin = {
+    isNormalUser = true;
+    createHome = true;
+    extraGroups = [ "wheel" "networkmanager" "video" "adbusers" ];
+    uid = 1000;
+    shell = pkgs.fish;
+    initialHashedPassword = "$6$d3FywUNCuZnJ4l.$ZW2ul59MLYon1v1xhC3lTJZfZ91lWW6Tpi13MpME0cJcYZNrsx7ABdgQRn.K05awruG2Y9ARAzURnmiJ31WTS1h";
+  };
+
+  nix = {
+    trustedUsers = [ "tazjin" ];
+  };
+
+  home-manager.useGlobalPkgs = true;
+  home-manager.users.tazjin = depot.users.tazjin.home."${config.networking.hostName}";
+}
diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix
index 7c3f91ff4d..05520dea9b 100644
--- a/users/tazjin/nixos/tverskoy/default.nix
+++ b/users/tazjin/nixos/tverskoy/default.nix
@@ -15,10 +15,11 @@ lib.fix (self: {
   imports = [
     (mod "open_eid.nix")
     (usermod "fonts.nix")
+    (usermod "home-config.nix")
     (usermod "persistence.nix")
     (usermod "physical.nix")
     (usermod "zerotier.nix")
-    "${pkgs.home-manager.src}/nixos"
+    (pkgs.home-manager.src + "/nixos")
   ] ++ lib.optional (builtins.pathExists ./local-config.nix) ./local-config.nix;
 
   tvl.cache.enable = true;
@@ -192,19 +193,6 @@ lib.fix (self: {
 
   time.timeZone = "Africa/Cairo";
 
-  nix = {
-    trustedUsers = [ "tazjin" ];
-  };
-
-  users.users.tazjin = {
-    isNormalUser = true;
-    createHome = true;
-    extraGroups = [ "wheel" "networkmanager" "video" "adbusers" ];
-    uid = 1000;
-    shell = pkgs.fish;
-    initialHashedPassword = "$6$d3FywUNCuZnJ4l.$ZW2ul59MLYon1v1xhC3lTJZfZ91lWW6Tpi13MpME0cJcYZNrsx7ABdgQRn.K05awruG2Y9ARAzURnmiJ31WTS1";
-  };
-
   programs = {
     adb.enable = true;
     fish.enable = true;
@@ -235,9 +223,6 @@ lib.fix (self: {
     };
   };
 
-  home-manager.useGlobalPkgs = true;
-  home-manager.users.tazjin = depot.users.tazjin.home.tverskoy;
-
   services.tailscale.enable = true;
 
   system.stateVersion = "20.09";