feat(steveej-x13s,graphical-fullblown): bump kernel and use libcamera w/ deps from unstable

nix/home-manager/configuration/graphical-fullblown.nix

@@ -8,8 +8,9 @@
   packages',
   ...
 }: let
-  # pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system};
-  pkgsUnstable = import nodeFlake.inputs.nixpkgs-unstable {inherit (pkgs) system config;};
+  pkgsUnstable =
+    pkgs.pkgsUnstable
+    or (import nodeFlake.inputs.nixpkgs-unstable {inherit (pkgs) system config overlays;});
 in {
   imports = [
     ../profiles/common.nix

nix/os/devices/steveej-x13s/flake.lock

@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730190761,
-        "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
+        "lastModified": 1731060864,
+        "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "3979285062d6781525cded0f6c4ff92e71376b55",
+        "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
         "type": "github"
       },
       "original": {
@@ -165,16 +165,16 @@
     "linux-jhovold": {
       "flake": false,
       "locked": {
-        "lastModified": 1730186574,
-        "narHash": "sha256-QjStPt3c/v55lJUgn4Rdx/WTaQKdUxNL9nwkIKQ8O2Q=",
+        "lastModified": 1730883079,
+        "narHash": "sha256-+ZU70M+mqo9SZNLkVtCM0+TdXEh7X39Kxmk6z58GMaM=",
         "owner": "jhovold",
         "repo": "linux",
-        "rev": "699d5b0ccdc1a343ded65aa876f0b720ca7dada9",
+        "rev": "9e9890798b6b4e81db66c572ee6acd291cf8cb77",
         "type": "github"
       },
       "original": {
         "owner": "jhovold",
-        "ref": "wip/sc8280xp-6.12-rc5",
+        "ref": "wip/sc8280xp-6.12-rc6",
         "repo": "linux",
         "type": "github"
       }
@@ -247,11 +247,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1730215039,
-        "narHash": "sha256-GxhtLAsdpZX2SndSu/AoKugk/vht5RZ47FTcrYILDew=",
+        "lastModified": 1731101150,
+        "narHash": "sha256-M9xa6UX6eidLFEfwHWkHkFJ+OgjuFqCIvuqsDSReyy4=",
         "ref": "bump",
-        "rev": "ff41877fbdf32f2029ade902f10142afb053d2da",
-        "revCount": 116,
+        "rev": "b74e8bfe82f059a5854cfc40f7206191edff365d",
+        "revCount": 117,
         "type": "git",
         "url": "https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git"
       },
@@ -291,11 +291,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1730327045,
-        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+        "lastModified": 1730883749,
+        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
         "type": "github"
       },
       "original": {
@@ -307,11 +307,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1730200266,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "lastModified": 1730785428,
+        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
         "type": "github"
       },
       "original": {

nix/os/devices/steveej-x13s/flake.nix

@@ -85,7 +85,12 @@
       inherit mkNixosConfiguration;
     };
 
-    overlays.libcamera = final: previous: {
+    overlays.libcamera = final: previous: let
+      webkitgtkPreConfigure = ''
+        export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 2 ? 2 : NIX_BUILD_CORES))"
+        export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES"
+      '';
+    in {
       wireplumber = previous.wireplumber.overrideAttrs (_: {
         version = "git";
         src = previous.fetchFromGitLab {
@@ -108,6 +113,21 @@
           ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so
         '';
       });
+
+      webkitgtk = previous.webkitgtk.overrideAttrs (attrs: {
+        preConfigure =
+          attrs.preConfigure + webkitgtkPreConfigure;
+      });
+
+      webkitgtk_4_1 = previous.webkitgtk_4_1.overrideAttrs (attrs: {
+        preConfigure =
+          attrs.preConfigure + webkitgtkPreConfigure;
+      });
+
+      webkitgtk_6_0 = previous.webkitgtk_6_0.overrideAttrs (attrs: {
+        preConfigure =
+          attrs.preConfigure + webkitgtkPreConfigure;
+      });
     };
 
     overlays.default = final: previous: let
@@ -117,19 +137,14 @@
         overlays = [self.overlays.libcamera];
       };
     in {
+      inherit pkgsUnstable;
       inherit
         (pkgsUnstable)
         libcamera
+        webkitgtk
+        webkitgtk_4_1
+        webkitgtk_6_0
         ;
-
-      webkitgtk = previous.webkitgtk.overrideAttrs (attrs: {
-        preConfigure =
-          attrs.preConfigure
-          + ''
-            export NIX_BUILD_CORES="$((NIX_BUILD_CORES > 8 ? 8 : NIX_BUILD_CORES))"
-            export NUMBER_OF_PROCESSORS="$NIX_BUILD_CORES"
-          '';
-      });
     };
 
     nixosConfigurations = {

nix/os/lib/default.nix

@@ -27,6 +27,7 @@ in {
           "adbusers"
           "scanner"
           "lp"
+          "kvm"
         ];
         openssh.authorizedKeys.keys = keys.users.steveej.openssh;