framework-2024-10-23-16-11-09

configs/plasma-wayland.nix

@@ -36,6 +36,7 @@
       kdePackages.filelight
       kdePackages.plasma-disks
       kdePackages.kalk
+      kdePackages.powerdevil
       krusader
       ktimetracker
       kdiff3

configs/user-gui.nix

@@ -18,7 +18,7 @@
       libertinus
       gyre-fonts
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-emoji
       noto-fonts-extra
 

machine/framework/configuration.nix

@@ -9,10 +9,10 @@ in
     ];
     config = {
       allowUnfree = true;
-      packageOverrides = pkgs: {
+      # packageOverrides = pkgs: {
-        intel-vaapi-driver =
+      #   intel-vaapi-driver =
-          pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
+      #     pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
-      };
+      # };
     };
   };
 
@@ -60,6 +60,11 @@ in
       efi = { canTouchEfiVariables = true; };
     };
 
+    kernelPatches = [{
+      name = "fix problems with netfilter in 6.11.4";
+      patch = ../../kernelpatches/fix-netfilter-6.11.4.patch;
+    }];
+
     tmp.useTmpfs = false;
   };
 
@@ -84,7 +89,7 @@ in
   time.timeZone = "Europe/Berlin";
 
   programs.fw-fanctrl = {
-    enable = true;
+    enable = false;
     config = {
       defaultStrategy = "lazy";
       strategies = {
@@ -115,7 +120,11 @@ in
     graphics = {
       enable = true;
       enable32Bit = true;
-      extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver ];
+      extraPackages = with pkgs; [
+        intel-media-driver
+        intel-vaapi-driver
+        vpl-gpu-rt
+      ];
     };
     pulseaudio.enable = false;
   };
@@ -130,6 +139,12 @@ in
 
     fwupd.enable = true;
 
+    btrfs.autoScrub = {
+      enable = true;
+      interval = "monthly";
+      fileSystems = [ "/home/alex/shared/storage" ];
+    };
+
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -172,27 +187,32 @@ in
 
   # systemd.services.nix-daemon.serviceConfig.LimitNOFILE = 40960;
 
-  environment.systemPackages = with pkgs; [
+  environment = {
-    # psensor
+    sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver
-    mission-center
+    systemPackages = with pkgs; [
-    resources
+      # psensor
-    monitorets
+      mission-center
+      resources
 
-    gnumake
+      gnumake
-    pkg-config
+      pkg-config
-    libftdi
+      libftdi
-    libusb1
+      libusb1
-    gcc
+      gcc
-    intel-gpu-tools
+
-    msr-tools
+      intel-gpu-tools
-    quota
+      msr-tools
-    mergerfs
+      quota
-    snapraid
+
-    gparted
+      mergerfs
-    homebank
+      snapraid
-    # fahviewer
+
-    # fahcontrol
+      gparted
-  ];
+      homebank
+      # fahviewer
+      # fahcontrol
+    ];
+  };
 
   # Set up deep sleep + hibernation
   swapDevices = [{

machine/framework/hardware-configuration.nix

@@ -5,7 +5,8 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
@@ -13,17 +14,40 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems = {
-    { device = "/dev/disk/by-uuid/5549d49d-165e-4a45-973e-6a32a63e31be";
+    "/" = {
+      device = "/dev/disk/by-uuid/5549d49d-165e-4a45-973e-6a32a63e31be";
       fsType = "ext4";
+      options = [
+        "noatime"
+        "nodiratime"
+        "discard"
+      ];
     };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/20D2-E669";
+      fsType = "vfat";
+    };
+    "/home/alex/shared/storage" = {
+      device = "/dev/disk/by-uuid/58259976-4f63-4f60-a755-7870b08286e7";
+      fsType = "btrfs";
+      options = [
+        "noatime"
+        "nodiratime"
+        "discard"
+        "subvol=@data"
+        "nofail"
+        "x-systemd.automount"
+      ];
+    };
+  };
 
   boot.initrd.luks.devices."luks-4f42a0a6-1f09-413c-8af3-9be8fc5c1b25".device = "/dev/disk/by-uuid/4f42a0a6-1f09-413c-8af3-9be8fc5c1b25";
 
-  fileSystems."/boot" =
+  environment.etc.crypttab.text = ''
-    { device = "/dev/disk/by-uuid/20D2-E669";
+    luks-e36ec189-2211-4bcc-bb9d-46650443d76b UUID=e36ec189-2211-4bcc-bb9d-46650443d76b /etc/luks-key01
-      fsType = "vfat";
+  '';
-    };
+  # boot.initrd.luks.devices."luks-e36ec189-2211-4bcc-bb9d-46650443d76b".device = "/dev/disk/by-uuid/e36ec189-2211-4bcc-bb9d-46650443d76b";
 
   swapDevices = [ ];
 

overlays/default.nix

@@ -10,6 +10,17 @@
     # example = prev.example.overrideAttrs (oldAttrs: rec {
     # ...
     # });
+
+    # linuxPackages_6_11 = final.pkgs.linuxPackagesFor (final.pkgs.linuxPackages_6_11.override {
+    #   argsOverride = rec {
+    #     src = final.pkgs.fetchurl {
+    #       url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
+    #       sha256 = "0wwv8jaipx352rna6bxj6jklmnm4kcikvzaag59m4zf1mz866wh5";
+    #     };
+    #     version = "6.11.3";
+    #     modDirVersion = "6.11.3";
+    #   };
+    # });
   };
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will