Compare commits

..

No commits in common. "32b7a34b6fa3edefff00cb438ca5aae4ff616b7e" and "a5dee47f5b8e89256b40ea31d8a6658e99802355" have entirely different histories.

2 changed files with 13 additions and 18 deletions

View file

@ -65,9 +65,7 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
( lixModules.${config.nixpkgs}.nixosModules.default
if (config.system == "x86_64-linux") then lixModules.${config.nixpkgs}.nixosModules.default else { }
)
./configurations/${name} ./configurations/${name}
(if config.enableHomeManager then home-manager.nixosModules.home-manager else { }) (if config.enableHomeManager then home-manager.nixosModules.home-manager else { })
(if (config.system == "x86_64-linux") then lanzaboote.nixosModules.lanzaboote else { }) (if (config.system == "x86_64-linux") then lanzaboote.nixosModules.lanzaboote else { })

View file

@ -1,4 +1,9 @@
{ config, machineProps, ... }: {
config,
lib,
machineProps,
...
}:
let let
anyWiresharkUser = anyWiresharkUser =
if machineProps.enableHomeManager then if machineProps.enableHomeManager then
@ -10,19 +15,11 @@ let
userUseWireshark = value: value.my.development.tools.networking.enable; userUseWireshark = value: value.my.development.tools.networking.enable;
in in
{ {
config = config = {
{ programs.wireshark.enable = anyWiresharkUser;
programs.wireshark.enable = anyWiresharkUser;
} users.users = builtins.mapAttrs (name: value: {
// ( extraGroups = if (userUseWireshark value) then [ "wireshark" ] else [ ];
if machineProps.enableHomeManager then }) config.home-manager.users;
{ };
users.users = builtins.mapAttrs (name: value: {
extraGroups = if (userUseWireshark value) then [ "wireshark" ] else [ ];
}) config.home-manager.users;
}
else
{ }
);
} }