convert host module parameter into proper options

Also remote Wootility module as this exists already in nixpkgs.

flake.nix

@@ -22,7 +22,12 @@
 
   outputs = { self, cups-brother-hl3172cdw, disko, nixpkgs, nixvim }@attrs:
   let
+    fullName = {
+      user.fullName = "Fabian Haas";
+    };
+
     defaultModules = [
+      fullName
       # Nixvim needs to be an top level import
       # Will fail due to infinit recursion otherwise
       nixvim.nixosModules.nixvim
@@ -32,19 +37,13 @@
       ./modules/text-processing.nix
       ./modules/workplace-compliance.nix
       ./modules/printing.nix
-      ./modules/hardware/Wooting/wootility.nix
       ./modules/development.nix
     ];
   in
   {
     nixosConfigurations.home-pc = nixpkgs.lib.nixosSystem {
       specialArgs = with attrs; {
         cups-brother-hl3172cdw = cups-brother-hl3172cdw.packages.x86_64-linux.default;
-        host = {
-          user.name = "fxbse";
-          user.description = "Fabian Haas";
-          name = "ice-cube";
-        };
       };
 
       system = "x86_64-linux";
@@ -54,11 +53,6 @@
     nixosConfigurations.nt-laptop = nixpkgs.lib.nixosSystem {
       specialArgs = with attrs; {
         cups-brother-hl3172cdw = cups-brother-hl3172cdw.packages.x86_64-linux.default;
-        host = rec {
-          user.name = "fhs";
-          user.description = "Fabian Haas";
-          name = "nt-${user.name}";
-        };
       };
 
       system = "x86_64-linux";
@@ -67,27 +61,23 @@
 
     nixosConfigurations.iso = nixpkgs.lib.nixosSystem {
       specialArgs = with attrs; {
-        host.user.description = "Fabian Haas";
-
         # TODO add your WiFi credentials
         # wifi.ssid
         # wifi.psk
       };
 
       modules = [
+       fullName
        nixvim.nixosModules.nixvim
        ./modules/text-processing.nix
        ./hosts/iso/configuration.nix
       ];
     };
 
     nixosConfigurations.server = nixpkgs.lib.nixosSystem {
-      specialArgs = with attrs; {
-        host.user.description = "Fabian Haas";
-      };
-
       system = "x86_64-linux";
       modules = [
+        fullName
         nixvim.nixosModules.nixvim
         disko.nixosModules.disko
         ./modules/text-processing.nix

hosts/home-pc/configuration.nix

@@ -1,4 +1,7 @@
-{ config, pkgs, host, ... }:
+{ config, pkgs, ... }:
+let
+  user = config.user;
+in
 {
   imports = [ ./hardware-configuration.nix ];
 
@@ -23,12 +26,18 @@
     cpuFreqGovernor = "schedutil";
   };
 
+  # Setup user and machine naming.
+  networking.hostName = "ice-cube";
+  user.name = "fxbse";
+
   # Desktop setup.
   desktop = {
     enable = true;
     login = "auto";   # No need to login againt to reach the desktop after LUKS decryption
   };
 
+  hardware.wooting.enable = true;
+
   # Development setup.
   development = {
     container.enable = true;
@@ -41,7 +50,7 @@
   programs.dconf.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.${host.user.name} = {
+  users.users.${user.name} = {
     isNormalUser = true;
     extraGroups = [
       "networkmanager"

hosts/nt-laptop/configuration.nix

@@ -1,6 +1,9 @@
 # Laptop model: Lenovo Thinkpad P15 Gen 1
 
-{ config, pkgs, host, ... }:
+{ config, pkgs, ... }:
+let
+  user = config.user;
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -24,6 +27,10 @@
 
   services.logind.lidSwitch = "lock";
 
+  # Setup user and machine naming.
+  networking.hostName = "nt-${user.name}";
+  user.name = "fhs";
+
   # Workplace compliance.
   workplaceCompliance = {
     enable = true;
@@ -48,7 +55,7 @@
   programs.dconf.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.${host.user.name} = {
+  users.users.${user.name} = {
     isNormalUser = true;
     extraGroups = [
       "networkmanager"

modules/desktop/desktop.nix

@@ -1,8 +1,7 @@
-{ config, host, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.desktop;
-  hostname = host.name;
-  username = host.user.name;
+  user = config.user;
 in
 {
   imports = [ ./gnome.nix ];
@@ -29,8 +28,12 @@ in
     };
   };
 
+  options.user.name = lib.mkOption {
+    description = "The username of the user of the maschine";
+    type = lib.types.str;
+  };
+
   config = lib.mkIf cfg.enable {
-    networking.hostName = lib.mkDefault hostname;
     networking.networkmanager.enable = lib.mkDefault true;
 
     # not to sure why this is done, but this is what the installer set up
@@ -52,12 +55,13 @@ in
     };
 
     services.libinput.enable = lib.mkDefault cfg.touchpad.enable;
+    users.groups.input.members = lib.optional config.hardware.wooting.enable user.name;
 
     services.printing.enable = true;
 
     # Enable automatic login for the user.
     services.displayManager.autoLogin.enable = cfg.login == "auto";
-    services.displayManager.autoLogin.user = lib.mkDefault username;
+    services.displayManager.autoLogin.user = lib.mkDefault user.name;
 
     boot.supportedFilesystems = [ "ntfs"  ];
     # Support mounting MTP devices

modules/development.nix

@@ -1,7 +1,7 @@
-{ config, lib, pkgs, host, ... }:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.development;
-  username = host.user.name;
+  username = config.user.name;
 in
 {
   options.development = {