diff --git a/flake.nix b/flake.nix index df59f87..2b5e789 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,7 @@ ./nixos/kde-desktop.nix ./nixos/cad.nix ./nixos/zerotier.nix - ./nixos/work.nix + ./nixos/family.nix ]; }; #Work laptop, dell g15. @@ -91,7 +91,7 @@ ./nixos/work.nix ]; }; - #Thinkpad E15 Gen 3 Laptop (ThinkPad) - Type 20YG - Model 20YG003EUS + #Thinkpad E15 Gen 3 Laptop - Type 20YG - Model 20YG003EUS raziel = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; diff --git a/nixos/family.nix b/nixos/family.nix index f9988ea..16e2f3f 100644 --- a/nixos/family.nix +++ b/nixos/family.nix @@ -1,10 +1,14 @@ -{ inputs, outputs, lib, config, pkgs, hostname, specialArgs, ... }: { +{ inputs, outputs, lib, config, pkgs, hostname, specialArgs, ... }: - services.displayManager = { +let + autoLoginUser = specialArgs.mainUser or null; +in +{ + services.displayManager = lib.mkIf (autoLoginUser != null) { autoLogin.enable = true; - autoLogin.user = "${specialArgs.mainUser}"; - }; + autoLogin.user = autoLoginUser; + }; users.users = { gwen = { isNormalUser = true; @@ -14,5 +18,9 @@ isNormalUser = true; extraGroups = [ "networkManager" ]; }; + logic11 = { + isNormalUser = true; + extraGroups = [ "wheel" "dialout" "networkmanager" "dialout" "docker" "plugdev" "vboxusers" ]; + }; }; }