From 51e3d8df22db480f45e35ccc284eda7b43f9792f Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 4 Sep 2024 16:32:40 +0700 Subject: [PATCH] :package: add network packages --- homes/common/default.nix | 1 + homes/common/network.nix | 34 ++++++++++++++++++++++++++++++++++ homes/common/packages.nix | 3 --- homes/root/default.nix | 1 + system/all/packages.nix | 2 -- 5 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 homes/common/network.nix diff --git a/homes/common/default.nix b/homes/common/default.nix index a32682e..ad10c3f 100644 --- a/homes/common/default.nix +++ b/homes/common/default.nix @@ -2,6 +2,7 @@ { imports = [ ./editor.nix + ./network.nix ./oh-my-posh ./packages.nix ./terminal.nix diff --git a/homes/common/network.nix b/homes/common/network.nix new file mode 100644 index 0000000..4e4b4c8 --- /dev/null +++ b/homes/common/network.nix @@ -0,0 +1,34 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; +{ + config = mkMerge [ + { + home.packages = [ + # firewall analysis + pkgs.nftables + pkgs.nixos-firewall-tool + + # analyser + pkgs.dnsutils + pkgs.tcpdump + pkgs.nmap + pkgs.rustscan + + # helper + pkgs.ipcalc + ]; + + } + + (mkIf config.gui.enable { + home.packages = [ + pkgs.wireshark + ]; + }) + ]; +} diff --git a/homes/common/packages.nix b/homes/common/packages.nix index 2e7ad48..50cf617 100644 --- a/homes/common/packages.nix +++ b/homes/common/packages.nix @@ -10,10 +10,7 @@ with lib; config = mkMerge [ { home.packages = [ - bind.dnsutils - nmap hexyl - ipcalc units difftastic diff --git a/homes/root/default.nix b/homes/root/default.nix index bf5a89b..8ee88e4 100644 --- a/homes/root/default.nix +++ b/homes/root/default.nix @@ -2,6 +2,7 @@ imports = [ ../common ]; + gui.enable = false; home.stateVersion = "22.11"; diff --git a/system/all/packages.nix b/system/all/packages.nix index 6d42a84..5b97b10 100644 --- a/system/all/packages.nix +++ b/system/all/packages.nix @@ -91,8 +91,6 @@ in tmux screen - tcpdump - duc memoryUsage