From 8d7f778b6537af2e94c83c37239f3f731a920b38 Mon Sep 17 00:00:00 2001 From: Vivian Date: Tue, 20 Feb 2024 16:18:54 +0100 Subject: [PATCH] wireshark --- common/desktop/default.nix | 4 ++-- hosts/thalassa/aoife/default.nix | 6 +----- hosts/thalassa/aoife/uni.nix | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 hosts/thalassa/aoife/uni.nix diff --git a/common/desktop/default.nix b/common/desktop/default.nix index 7d5176a3..d6e00e1f 100644 --- a/common/desktop/default.nix +++ b/common/desktop/default.nix @@ -62,7 +62,7 @@ }; # Global Packages - environment.systemPackages = with pkgs; [ wireguard-tools sbctl podman-compose ]; + environment.systemPackages = with pkgs; [ wireguard-tools sbctl ]; # ++ (if config.virtualisation.podman.enable then [ pkgs.podman-compose ] else []); # programs.virt-manager = { # enable = true; @@ -74,7 +74,7 @@ security.rtkit.enable = true; virtualisation = { - podman.enable = true; + podman.enable = lib.mkDefault true; libvirtd = { enable = true; qemu.package = pkgs.qemu_kvm; diff --git a/hosts/thalassa/aoife/default.nix b/hosts/thalassa/aoife/default.nix index 056b0322..863dcf83 100644 --- a/hosts/thalassa/aoife/default.nix +++ b/hosts/thalassa/aoife/default.nix @@ -8,6 +8,7 @@ ./hardware-configuration.nix inputs.nixos-hardware.nixosModules.lenovo-thinkpad-z ./hardware.nix + ./uni.nix ]; meta = { @@ -15,11 +16,6 @@ isLaptop = true; }; - programs.wireshark.enable = true; - users.extraUsers.vivian.extraGroups = [ "wireshark" ]; - - virtualisation.lxc.enable = true; - # Bootloader. boot = { bootspec.enable = true; diff --git a/hosts/thalassa/aoife/uni.nix b/hosts/thalassa/aoife/uni.nix new file mode 100644 index 00000000..6701a86a --- /dev/null +++ b/hosts/thalassa/aoife/uni.nix @@ -0,0 +1,15 @@ +# Config options needed for various university courses, such as: +# * Wireless IoT and Local Area Networks +# * Network Security +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ docker-compose ]; + + programs.wireshark.enable = true; + programs.wireshark.package = pkgs.wireshark; + users.extraUsers.vivian.extraGroups = [ "wireshark" "docker" ]; + + virtualisation.lxc.enable = true; + virtualisation.podman.enable = false; + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = "btrfs"; +}