diff --git a/home/c/default.nix b/home/c/default.nix index 2ea03a3..caf53a6 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -58,6 +58,7 @@ xh unzip just + wireshark inputs.nixvim.packages."x86_64-linux".default # nixvim ]; diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index 0cc2c8d..6b513dd 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -19,7 +19,7 @@ users.users.c = { isNormalUser = true; - extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout"]; + extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout" "wireshark"]; openssh.authorizedKeys.keys = config.keys.c; shell = pkgs.fish; packages = with pkgs; []; diff --git a/hosts/artemis/containers.nix b/hosts/artemis/containers.nix index d48fd4d..2270540 100644 --- a/hosts/artemis/containers.nix +++ b/hosts/artemis/containers.nix @@ -1,5 +1,6 @@ {...}: { virtualisation = { + waydroid.enable = true; libvirtd.enable = true; podman = { enable = true; diff --git a/hosts/artemis/hardware-configuration.nix b/hosts/artemis/hardware-configuration.nix index ea77e71..e23395b 100644 --- a/hosts/artemis/hardware-configuration.nix +++ b/hosts/artemis/hardware-configuration.nix @@ -12,6 +12,10 @@ initrd.kernelModules = []; kernelModules = ["kvm-intel"]; extraModulePackages = []; + kernelParams = [ + "i915.enable_psr=0" + "i915.enable_fbc=0" + ]; #kernelPackages = pkgs.linuxPackages_latest; loader.systemd-boot.enable = lib.mkForce false; @@ -32,11 +36,12 @@ enable = true; extraPackages = with pkgs; [ intel-media-driver # LIBVA_DRIVER_NAME=iHD - intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + intel-ocl libvdpau-va-gl vaapiVdpau intel-compute-runtime - unstable.vpl-gpu-rt + vpl-gpu-rt ]; }; diff --git a/hosts/artemis/programs.nix b/hosts/artemis/programs.nix index 363fae1..a345571 100644 --- a/hosts/artemis/programs.nix +++ b/hosts/artemis/programs.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { programs = { + wireshark.enable = true; fish.enable = true; seahorse.enable = true; nix-ld.enable = true; diff --git a/hosts/hermes/headscale.nix b/hosts/hermes/headscale.nix index 5555b0b..0160ead 100644 --- a/hosts/hermes/headscale.nix +++ b/hosts/hermes/headscale.nix @@ -8,7 +8,7 @@ in { port = 8080; settings = { server_url = "https://${domain}"; - dns_config = {base_domain = "cleslie.uk";}; + dns = {base_domain = "net.cleslie.uk";}; ip_prefixes = "100.64.0.0/10"; }; diff --git a/hosts/hermes/media.nix b/hosts/hermes/media.nix index c5c24b0..b2745c2 100644 --- a/hosts/hermes/media.nix +++ b/hosts/hermes/media.nix @@ -48,6 +48,12 @@ in { ]; }; + nixpkgs.config.permittedInsecurePackages = [ + "aspnetcore-runtime-6.0.36" + "aspnetcore-runtime-wrapped-6.0.36" + "dotnet-sdk-6.0.428" + "dotnet-sdk-wrapped-6.0.428" + ]; services = { caddy = { enable = true; diff --git a/packages/default.nix b/packages/default.nix index d7249c1..57b5e6c 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -12,7 +12,7 @@ nish = inputs'.nish.packages.default; nsbm = inputs'.nsbm.packages.default; jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override { - ffmpeg_6-full = pkgs.ffmpeg_6-full.override { + ffmpeg_7-full = pkgs.ffmpeg_7-full.override { withMfx = false; withVpl = true; };