From 9e7eca47bb3ddb6e88720cfcb28c995acbb072c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 17 Feb 2024 12:18:48 +0100 Subject: spt-omnia: deploy --- nixos/modules/develop.nix | 4 +--- nixos/modules/generic.nix | 4 +++- nixos/modules/syncthing.nix | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix index 97c54ee..3ef6ce6 100644 --- a/nixos/modules/develop.nix +++ b/nixos/modules/develop.nix @@ -90,7 +90,6 @@ in { # Network iperf3 - wireshark inetutils # Gtk @@ -116,7 +115,7 @@ in { # Images imagemagick ]; - programs.wireshark.enable = true; + programs.wireshark.package = pkgs.wireshark; documentation = { dev.enable = true; @@ -152,7 +151,6 @@ in { "lxd" "develop" "libvirtd" - "wireshark" ]; }; } diff --git a/nixos/modules/generic.nix b/nixos/modules/generic.nix index a3e8dd1..33d7024 100644 --- a/nixos/modules/generic.nix +++ b/nixos/modules/generic.nix @@ -121,7 +121,7 @@ in { }; cynerd = { group = "cynerd"; - extraGroups = ["users" "wheel" "dialout" "kvm" "uucp"]; + extraGroups = ["users" "wheel" "dialout" "kvm" "uucp" "wireshark"]; uid = 1000; subUidRanges = [ { @@ -155,6 +155,8 @@ in { }; shellrc = true; vim.defaultEditor = mkDefault true; + + wireshark.enable = true; }; security.sudo.extraRules = [ diff --git a/nixos/modules/syncthing.nix b/nixos/modules/syncthing.nix index af6d957..b93ecdb 100644 --- a/nixos/modules/syncthing.nix +++ b/nixos/modules/syncthing.nix @@ -13,7 +13,6 @@ "errol" "lipwig" "ridcully" - "susan" "spt-omnia" ]; mediaDevices = [ -- cgit v1.2.3