Compare commits

...

2 commits

Author SHA1 Message Date
Victor Mignot a5dee47f5b
Update flake.lock 2024-08-03 22:18:53 +02:00
Victor Mignot 38d7e61d74
Add wireshark option 2024-08-03 22:17:23 +02:00
7 changed files with 75 additions and 12 deletions

View file

@ -90,7 +90,8 @@
];
nixpkgs.config.allowUnfree = true;
my.development.embedded-tools.enable = true;
my.development.tools.embedded.enable = true;
my.development.tools.networking.enable = true;
my.games.wine.enable = true;
};
};

View file

@ -204,11 +204,11 @@
]
},
"locked": {
"lastModified": 1722462338,
"narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
"lastModified": 1722630065,
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
"rev": "afc892db74d65042031a093adb6010c4c3378422",
"type": "github"
},
"original": {
@ -346,11 +346,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1722372011,
"narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=",
"lastModified": 1722519197,
"narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cf05eeada35e122770c5c14add958790fcfcbef5",
"rev": "05405724efa137a0b899cce5ab4dde463b4fd30b",
"type": "github"
},
"original": {

View file

@ -1,5 +1,4 @@
{
lib,
config,
pkgs,
machineProps,
@ -13,6 +12,7 @@
./sound.nix
./desktop.nix
./bluetooth.nix
./wireshark.nix
];
config =

View file

@ -6,7 +6,10 @@
}:
with lib;
{
imports = [ ./embedded.nix ];
imports = [
./embedded.nix
./networking.nix
];
options.my.development.git.enable = mkOption {
type = types.bool;

View file

@ -4,9 +4,12 @@
pkgs,
...
}:
let
toolsConfig = config.my.development.tools.embedded;
in
with lib;
{
options.my.development.embedded-tools.enable = mkOption {
options.my.development.tools.embedded.enable = mkOption {
type = types.bool;
default = false;
example = true;
@ -15,7 +18,7 @@ with lib;
'';
};
options.my.development.embedded-tools.packages = mkOption {
options.my.development.tools.embedded.packages = mkOption {
type = types.listOf types.package;
default = with pkgs; [
qemu
@ -23,5 +26,5 @@ with lib;
];
};
config.home.packages = lib.mkIf config.my.development.embedded-tools.enable config.my.development.embedded-tools.packages;
config.home.packages = mkIf toolsConfig.enable toolsConfig.packages;
}

View file

@ -0,0 +1,31 @@
{
config,
lib,
pkgs,
...
}:
let
toolsConfig = config.my.development.tools.networking;
in
with lib;
{
options.my.development.tools.networking = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Enable network analysis tools.
'';
};
packages = mkOption {
type = types.listOf types.package;
default = with pkgs; [ wireshark ];
description = ''
Network analysis tools to install.
'';
};
};
config.home.packages = mkIf toolsConfig.enable toolsConfig.packages;
}

View file

@ -0,0 +1,25 @@
{
config,
lib,
machineProps,
...
}:
let
anyWiresharkUser =
if machineProps.enableHomeManager then
(builtins.any (user: user.my.development.tools.networking.enable) (
builtins.attrValues config.home-manager.users
))
else
false;
userUseWireshark = value: value.my.development.tools.networking.enable;
in
{
config = {
programs.wireshark.enable = anyWiresharkUser;
users.users = builtins.mapAttrs (name: value: {
extraGroups = if (userUseWireshark value) then [ "wireshark" ] else [ ];
}) config.home-manager.users;
};
}