desktop-2024-09-16-22-47-01

machine/desktop/configuration.nix

@@ -101,6 +101,8 @@ in
 
     snapraid
     mergerfs
+
+    gimp
   ];
 
   hardware = {

machine/desktop/hardware-configuration.nix

@@ -1,11 +1,8 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
-
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
@@ -13,27 +10,30 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d43faf8e-ec90-4735-a1a4-aff6897604b2";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/d43faf8e-ec90-4735-a1a4-aff6897604b2";
+    options = [ "discard" ];
+    fsType = "ext4";
+  };
 
-  boot.initrd.luks.devices."luks-ba8eb308-e85f-4cee-9993-88c5ba0966ea".device = "/dev/disk/by-uuid/ba8eb308-e85f-4cee-9993-88c5ba0966ea";
+  fileSystems."/mnt/data" = {
+    device = "/dev/disk/by-uuid/441a7d92-c3eb-4867-81c7-4e1dc3a1c54d";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1838-7DA8";
-      fsType = "vfat";
-    };
+  boot.initrd.luks.devices."luks-ba8eb308-e85f-4cee-9993-88c5ba0966ea" = {
+    device = "/dev/disk/by-uuid/ba8eb308-e85f-4cee-9993-88c5ba0966ea";
+    allowDiscards = true;
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/1838-7DA8";
+    fsType = "vfat";
+  };
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

machine/framework/configuration.nix

@@ -112,6 +112,7 @@ in
 
     opengl = {
       enable = true;
+      driSupport = true;
       driSupport32Bit = true;
       extraPackages = with pkgs; [ intel-media-driver intel-vaapi-driver ];
     };

machine/homeserver.nix

@@ -109,19 +109,19 @@ in {
     '';
   };
 
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-  };
+  # nixpkgs.config.packageOverrides = pkgs: {
+  #   vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  # };
 
-  hardware.opengl = {
-    enable = true;
-    # extraPackages = with pkgs; [
-    #   #intel-media-driver # LIBVA_DRIVER_NAME=iHD
-    #   vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
-    #   vaapiVdpau
-    #   libvdpau-va-gl
-    # ];
-  };
+  # hardware.opengl = {
+  #   enable = true;
+  #   # extraPackages = with pkgs; [
+  #   #   #intel-media-driver # LIBVA_DRIVER_NAME=iHD
+  #   #   vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+  #   #   vaapiVdpau
+  #   #   libvdpau-va-gl
+  #   # ];
+  # };
 
   services = {
     jellyfin = {