From 6624ebeff383100d4c54fc409b7bfa327298921c Mon Sep 17 00:00:00 2001 From: smayzy Date: Thu, 14 Aug 2025 12:09:11 +0200 Subject: [PATCH] move wireshark to mudule and correct permitions --- hosts/common/common.nix | 1 + modules/nix/groups/desktop.nix | 1 + modules/nix/groups/laptop.nix | 1 + modules/nix/networking/default.nix | 1 + modules/nix/networking/wireshark.nix | 16 ++++++++++++++++ modules/nix/utilities/gui-utilities.nix | 1 - 6 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 modules/nix/networking/wireshark.nix diff --git a/hosts/common/common.nix b/hosts/common/common.nix index bdc8d61..229cc56 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -20,6 +20,7 @@ "networkmanager" "wheel" "adbusers" + "wireshark" ]; }; diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index 30250c8..9fefcba 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -50,6 +50,7 @@ in desmume.enable = true; ghidra.enable = true; firejail.enable = true; + wireshark.enable = true; }; }; } diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index 308af0d..a65ba73 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -46,6 +46,7 @@ in alacritty.enable = true; chromium.enable = true; firejail.enable = true; + wireshark.enable = true; }; }; } diff --git a/modules/nix/networking/default.nix b/modules/nix/networking/default.nix index 29f07f6..735eff3 100644 --- a/modules/nix/networking/default.nix +++ b/modules/nix/networking/default.nix @@ -2,5 +2,6 @@ { imports = [ ./openssh.nix + ./wireshark.nix ]; } diff --git a/modules/nix/networking/wireshark.nix b/modules/nix/networking/wireshark.nix new file mode 100644 index 0000000..7a0ba99 --- /dev/null +++ b/modules/nix/networking/wireshark.nix @@ -0,0 +1,16 @@ +{ lib, config, pkgs, ... }: +let + inherit (lib) mkIf mkOption types; +in +{ + options.smayzy.wireshark.enable = mkOption { + type = types.bool; + default = false; + description = "wireshark"; + }; + + config = mkIf config.smayzy.wireshark.enable { + programs.wireshark.enable = true; + environment.systemPackages = with pkgs; [ wireshark ]; + }; +} diff --git a/modules/nix/utilities/gui-utilities.nix b/modules/nix/utilities/gui-utilities.nix index d4dde55..befea8f 100644 --- a/modules/nix/utilities/gui-utilities.nix +++ b/modules/nix/utilities/gui-utilities.nix @@ -20,7 +20,6 @@ in baobab loupe gimp3 - wireshark audacity networkmanagerapplet gparted