Fix the issue with username

.gitignore

@@ -0,0 +1 @@
+result

flake.nix

@@ -13,29 +13,29 @@
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
-    let
-      lib = nixpkgs.lib;
-      system = "x86_64-linux";
-    in
-    {
-      nixosConfigurations = {
-        nixos = lib.nixosSystem {
-          inherit system;
-          specialArgs = {inherit inputs;};
-          modules = [ 
-            ./machines/wospbook
-            inputs.home-manager.nixosModules.default
-          ];
-        };
+  let
+    lib = nixpkgs.lib;
+    system = "x86_64-linux";
+  in
+  {
+    nixosConfigurations = {
+      nixos = lib.nixosSystem {
+        inherit system;
+        specialArgs = {inherit inputs;};
+        modules = [ 
+          ./machines/wospbook
+          inputs.home-manager.nixosModules.default
+        ];
+      };
 
-        kiwee = lib.nixosSystem {
-          inherit system;
-          specialArgs = {inherit inputs;};
-          modules = [
-            ./machines/workstation
-            inputs.home-manager.nixosModules.default
-          ];
-        };
+      kiwee = lib.nixosSystem {
+        inherit system;
+        specialArgs = {inherit inputs;};
+        modules = [
+          ./machines/workstation
+          inputs.home-manager.nixosModules.default
+        ];
       };
     };
+  };
 }

home-manager/work.nix

@@ -1,21 +1,34 @@
-{ pkgs, ... }:
+{ pkgs, config, lib, ... }:
 
 {
   imports = [
-    ./common.nix  
+    ./common.nix
   ];
 
-  home.username = "work";
-  home.homeDirectory = "/home/work";
+  options.work-user = {
+    username = lib.mkOption {
+      default = "work";
+      type = lib.types.str;
+    };
+  };
 
-  home.packages = with pkgs; [
-    firefox # Yuck!
-    thunderbird
-    slack
-    dbeaver
-  ];
+  config =
+  let
+    cfg = config.work-user;
+  in
+  {
+    home.username = cfg.username;
+    home.homeDirectory = "/home/${cfg.username}";
+
+    home.packages = with pkgs; [
+      firefox # Yuck!
+      thunderbird
+      slack
+      dbeaver
+    ];
   
-  programs.helix.extraPackages = [
-    pkgs.nodePackages_latest.intelephense
-  ];
+    programs.helix.extraPackages = [
+      pkgs.nodePackages_latest.intelephense
+    ];
+  };
 }

machines/workstation/default.nix

@@ -1,5 +1,6 @@
-{ config, pkgs, inputs, ... }:
-
+let
+  username = "serge";
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -20,7 +21,9 @@
     LC_TIME = "pl_PL.UTF-8";
   };
 
-  users.users.serge = {
+  work-user.username = username;
+
+  users.users.${username}= {
     isNormalUser = true;
     uid = 1000;
     description = "Serhii Korzh";
@@ -28,7 +31,7 @@
   };
 
   home-manager.users = {
-    "serge" = import ../../home-manager/work.nix;
+    "${username}" = import ../../home-manager/work.nix;
   };
 
   # Enable automatic login for the user.