From e625e79bda43e09adfec34e0440f12ecc9404a03 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Fri, 31 May 2024 09:20:03 -0300 Subject: [PATCH 1/3] Add traverse to family users --- flake.nix | 4 ++-- nixos/family.nix | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) 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" ]; + }; }; } From 3dfdd8c074345cbe308f981e0089c3396609909f Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Fri, 31 May 2024 09:36:03 -0300 Subject: [PATCH 2/3] Added comma --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index cf8dab1..06199c3 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -91,6 +91,7 @@ pkgs.usbutils pkgs.pciutils pkgs.atool + pkgs.comma appimage-run ]; From 7c04a2da97179036d3431f1be240bd3a24a17a40 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Fri, 31 May 2024 09:42:28 -0300 Subject: [PATCH 3/3] Enable home-manager for users --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 06199c3..c5f788f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -92,6 +92,7 @@ pkgs.pciutils pkgs.atool pkgs.comma + pkgs.home-manager appimage-run ];