migrate to using module options for the username

flake.nix

@@ -106,6 +106,7 @@
         inherit system;
         modules = [
           lix-module.nixosModules.default
+          (import ./nixos/options.nix)
           (./. + "/nixos/boxes/${hostname}")
           (import ./nixos/email-accounts.nix)
           (import ./nixos/common.nix)
@@ -171,6 +172,7 @@
         system = "aarch64-darwin";
         modules = [
           lix-module.nixosModules.default
+          (import ./nixos/options.nix)
           (./. + "/nixos/boxes/cushy")
           {users.users."Cyryl.Plotnicki".home = "/Users/Cyryl.Plotnicki";}
           home-manager.darwinModules.home-manager
@@ -196,6 +198,7 @@
         system = "aarch64-darwin";
         modules = [
           lix-module.nixosModules.default
+          (import ./nixos/options.nix)
           (./. + "/nixos/boxes/airy")
           {users.users.cyryl.home = "/Users/cyryl";}
           home-manager.darwinModules.home-manager

nixos/boxes/cushy/default.nix

@@ -5,28 +5,12 @@
   lib,
   nixpkgs-nixos-unstable-and-unfree,
   ...
-}: let
+}: {
-  username = "Cyryl.Plotnicki";
+  local.username = "Cyryl.Plotnicki";
-in {
   imports = [
-    (import ../../zsh {
+    ../../zsh
-      inherit pkgs;
+    ../../git
-      inherit lib;
+    ../../helix
-      inherit config;
-      cyplo.username = username;
-    })
-    (import ../../git {
-      inherit pkgs;
-      inherit lib;
-      inherit config;
-      cyplo.username = username;
-    })
-    (import ../../helix {
-      inherit pkgs;
-      inherit lib;
-      inherit config;
-      cyplo.username = username;
-    })
   ];
   services.nix-daemon.enable = true;
 

nixos/git/default.nix

@@ -2,13 +2,7 @@
   config,
   pkgs,
   lib,
-  cyplo,
   ...
-}: let
+}: {
-  username =
+  home-manager.users."${config.local.username}" = {...}: {imports = [./home.nix];};
-    if cyplo ? username
-    then "${cyplo.username}"
-    else "cyryl";
-in {
-  home-manager.users."${username}" = {...}: {imports = [./home.nix];};
 }

nixos/helix/default.nix

@@ -2,16 +2,8 @@
   config,
   pkgs,
   lib,
-  cyplo,
   ...
-}: 
+}: {
-let
-  username =
-    if cyplo ? username
-    then "${cyplo.username}"
-    else "cyryl";
-in
-{
   nix.settings = {
     trusted-substituters = [
       "https://helix.cachix.org"
@@ -20,5 +12,5 @@ in
       "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
     ];
   };
-  home-manager.users."${username}" = {...}: {imports = [./home.nix];};
+  home-manager.users."${config.local.username}" = {...}: {imports = [./home.nix];};
 }

nixos/options.nix

@@ -0,0 +1,10 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  options.local.username = lib.mkOption {
+    default = "cyryl";
+    type = lib.types.str;
+  };
+}

nixos/zsh/default.nix

@@ -2,14 +2,8 @@
   config,
   pkgs,
   lib,
-  cyplo,
   ...
-}: let
+}: {
-  username =
-    if cyplo ? username
-    then "${cyplo.username}"
-    else "cyryl";
-in {
   programs.zsh.enable = true;
-  home-manager.users."${username}" = {...}: {imports = [./home.nix];};
+  home-manager.users."${config.local.username}" = {...}: {imports = [./home.nix];};
 }