From 760b0c616334a6e60cdfe5626dd629c6be3ad567 Mon Sep 17 00:00:00 2001
From: Martin Benonisen <m.s.benonisen@usit.uio.no>
Date: Wed, 1 May 2024 18:29:17 +0200
Subject: [PATCH] nixlol

---
 hosts/zedd/configuration.nix |  2 ++
 system/hardware.nix          | 14 +++++++++++++-
 system/programs.nix          |  1 +
 system/services.nix          |  1 -
 user/packages/default.nix    |  8 ++++++++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/hosts/zedd/configuration.nix b/hosts/zedd/configuration.nix
index 0cabef1..c7f931c 100644
--- a/hosts/zedd/configuration.nix
+++ b/hosts/zedd/configuration.nix
@@ -31,6 +31,7 @@
     XDG_STATE_HOME = "$HOME/.local/state";
     XDG_BIN_HOME = "$HOME/.local/bin";
     PATH = [ "${XDG_BIN_HOME}" ];
+
   };
   fileSystems."/data" = {
     device = "/dev/data/data";
@@ -62,6 +63,7 @@
     trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ];
   };
   virtualisation.docker.enable = true;
+  virtualisation.docker.liveRestore = false;
   system.stateVersion = "23.11"; # Did you read the comment?
 
 }
diff --git a/system/hardware.nix b/system/hardware.nix
index a7bed51..a68505a 100644
--- a/system/hardware.nix
+++ b/system/hardware.nix
@@ -1,10 +1,21 @@
 { config, pkgs, ... }:
 {
+
+  nixpkgs.config.packageOverrides = pkgs: {
+    intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+  };
   hardware = {
+    enableRedistributableFirmware = true;
+    cpu.intel.updateMicrocode = true;
     opengl = {
       enable = true;
       driSupport = true;
       driSupport32Bit = true;
+      extraPackages = with pkgs; [
+        intel-media-driver
+        intel-vaapi-driver
+        libvdpau-va-gl
+      ];
     };
     ckb-next.enable = true;
     nvidia = {
@@ -13,8 +24,9 @@
       powerManagement.finegrained = false;
       open = false;
       nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      package = config.boot.kernelPackages.nvidiaPackages.production;
     };
     pulseaudio.enable = false;
   };
+  environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; };
 }
diff --git a/system/programs.nix b/system/programs.nix
index 5c285c1..55865eb 100644
--- a/system/programs.nix
+++ b/system/programs.nix
@@ -41,6 +41,7 @@
     xdg-utils
     pass
     xdg-desktop-portal
+    pkg-config
     xdg-desktop-portal-gtk
     zoom-us
     neovim
diff --git a/system/services.nix b/system/services.nix
index 801c6e4..a975be3 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -30,7 +30,6 @@
           i3blocks #if you are planning on using i3blocks over i3status
           polybar
           rofi
-          picom
           nitrogen
         ];
       };
diff --git a/user/packages/default.nix b/user/packages/default.nix
index d782f36..a5f640d 100644
--- a/user/packages/default.nix
+++ b/user/packages/default.nix
@@ -3,7 +3,11 @@
     # Generic tools
     age
     discord
+    libpng
+    lshw
     vlc
+    expat
+    xdeltaUnstable
     transmission-gtk
     alacritty
     btop
@@ -21,7 +25,11 @@
     ncdu
     nwg-look
     mumble
+    pavucontrol
+    jellyfin-media-player
+    unrar
     mpv
+    lutris
     pamixer
     pinentry
     pre-commit