Merge 94d9dc6992 into 37b26d1f17

home/c/default.nix

@@ -58,7 +58,6 @@
     xh
     unzip
     just
-    wireshark
     inputs.nixvim.packages."x86_64-linux".default # nixvim
   ];
 

hosts/artemis/configuration.nix

@@ -19,7 +19,7 @@
 
   users.users.c = {
     isNormalUser = true;
-    extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout" "wireshark"];
+    extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout"];
     openssh.authorizedKeys.keys = config.keys.c;
     shell = pkgs.fish;
     packages = with pkgs; [];

hosts/artemis/containers.nix

@@ -1,6 +1,5 @@
 {...}: {
   virtualisation = {
-    waydroid.enable = true;
     libvirtd.enable = true;
     podman = {
       enable = true;

hosts/artemis/hardware-configuration.nix

@@ -12,10 +12,6 @@
     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;
@@ -36,12 +32,11 @@
       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
-        vpl-gpu-rt
+        unstable.vpl-gpu-rt
       ];
     };
 

hosts/artemis/programs.nix

@@ -1,6 +1,5 @@
 {pkgs, ...}: {
   programs = {
-    wireshark.enable = true;
     fish.enable = true;
     seahorse.enable = true;
     nix-ld.enable = true;

hosts/hermes/headscale.nix

@@ -8,7 +8,7 @@ in {
       port = 8080;
       settings = {
         server_url = "https://${domain}";
-        dns = {base_domain = "net.cleslie.uk";};
+        dns_config = {base_domain = "cleslie.uk";};
 
         ip_prefixes = "100.64.0.0/10";
       };

hosts/hermes/media.nix

@@ -48,12 +48,6 @@ 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;

packages/default.nix

@@ -12,7 +12,7 @@
   nish = inputs'.nish.packages.default;
   nsbm = inputs'.nsbm.packages.default;
   jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override {
-    ffmpeg_7-full = pkgs.ffmpeg_7-full.override {
+    ffmpeg_6-full = pkgs.ffmpeg_6-full.override {
       withMfx = false;
       withVpl = true;
     };