Checking in various updates

53 files changed, 972 insertions, 651 deletions

diff --git a/files/nixpkgs-patches/30720.diff b/files/nixpkgs-patches/30720.diff
new file mode 100644
index 0000000..4c80212
--- /dev/null
+++ b/files/nixpkgs-patches/30720.diff
@@ -0,0 +1,106 @@
+diff --git a/src/amd/compiler/aco_scheduler.cpp b/src/amd/compiler/aco_scheduler.cpp
+index 0bfce41101e5a1a3d84632fee58f99ae398cdcc9..f3c1555c1e749b00080dfaf882a59f7ae42357d6 100644
+--- a/src/amd/compiler/aco_scheduler.cpp
++++ b/src/amd/compiler/aco_scheduler.cpp
+@@ -12,17 +12,17 @@
+ #include <algorithm>
+ #include <vector>
+ 
+-#define SMEM_WINDOW_SIZE    (350 - ctx.num_waves * 35)
+-#define VMEM_WINDOW_SIZE    (1024 - ctx.num_waves * 64)
++#define SMEM_WINDOW_SIZE    (256 - ctx.occupancy_factor * 16)
++#define VMEM_WINDOW_SIZE    (1024 - ctx.occupancy_factor * 64)
+ #define LDS_WINDOW_SIZE     64
+ #define POS_EXP_WINDOW_SIZE 512
+-#define SMEM_MAX_MOVES      (64 - ctx.num_waves * 4)
+-#define VMEM_MAX_MOVES      (256 - ctx.num_waves * 16)
++#define SMEM_MAX_MOVES      (128 - ctx.occupancy_factor * 8)
++#define VMEM_MAX_MOVES      (256 - ctx.occupancy_factor * 16)
+ #define LDSDIR_MAX_MOVES    10
+ #define LDS_MAX_MOVES       32
+ /* creating clauses decreases def-use distances, so make it less aggressive the lower num_waves is */
+-#define VMEM_CLAUSE_MAX_GRAB_DIST (ctx.num_waves * 2)
+-#define VMEM_STORE_CLAUSE_MAX_GRAB_DIST (ctx.num_waves * 4)
++#define VMEM_CLAUSE_MAX_GRAB_DIST       (ctx.occupancy_factor * 2)
++#define VMEM_STORE_CLAUSE_MAX_GRAB_DIST (ctx.occupancy_factor * 4)
+ #define POS_EXP_MAX_MOVES         512
+ 
+ namespace aco {
+@@ -115,7 +115,7 @@ struct MoveState {
+ 
+ struct sched_ctx {
+    amd_gfx_level gfx_level;
+-   int16_t num_waves;
++   int16_t occupancy_factor;
+    int16_t last_SMEM_stall;
+    int last_SMEM_dep_idx;
+    MoveState mv;
+@@ -745,7 +745,7 @@ schedule_SMEM(sched_ctx& ctx, Block* block, Instruction* current, int idx)
+       /* only move VMEM instructions below descriptor loads. be more aggressive at higher num_waves
+        * to help create more vmem clauses */
+       if ((candidate->isVMEM() || candidate->isFlatLike()) &&
+-          (cursor.insert_idx - cursor.source_idx > (ctx.num_waves * 4) ||
++          (cursor.insert_idx - cursor.source_idx > (ctx.occupancy_factor * 4) ||
+            current->operands[0].size() == 4))
+          break;
+       /* don't move descriptor loads below buffer loads */
+@@ -847,7 +847,7 @@ schedule_SMEM(sched_ctx& ctx, Block* block, Instruction* current, int idx)
+    }
+ 
+    ctx.last_SMEM_dep_idx = found_dependency ? up_cursor.insert_idx : 0;
+-   ctx.last_SMEM_stall = 10 - ctx.num_waves - k;
++   ctx.last_SMEM_stall = 10 - ctx.occupancy_factor - k;
+ }
+ 
+ void
+@@ -1247,35 +1247,30 @@ schedule_program(Program* program)
+    RegisterDemand demand;
+    for (Block& block : program->blocks)
+       demand.update(block.register_demand);
+-   demand.vgpr += program->config->num_shared_vgprs / 2;
+ 
+    sched_ctx ctx;
+    ctx.gfx_level = program->gfx_level;
+    ctx.mv.depends_on.resize(program->peekAllocationId());
+    ctx.mv.RAR_dependencies.resize(program->peekAllocationId());
+    ctx.mv.RAR_dependencies_clause.resize(program->peekAllocationId());
+-   /* Allowing the scheduler to reduce the number of waves to as low as 5
+-    * improves performance of Thrones of Britannia significantly and doesn't
+-    * seem to hurt anything else. */
+-   unsigned wave_fac = program->dev.physical_vgprs / 256;
+-   if (program->num_waves <= 5 * wave_fac)
+-      ctx.num_waves = program->num_waves;
+-   else if (demand.vgpr >= 29)
+-      ctx.num_waves = 5 * wave_fac;
+-   else if (demand.vgpr >= 25)
+-      ctx.num_waves = 6 * wave_fac;
+-   else
+-      ctx.num_waves = 7 * wave_fac;
+-   ctx.num_waves = std::max<uint16_t>(ctx.num_waves, program->min_waves);
+-   ctx.num_waves = std::min<uint16_t>(ctx.num_waves, program->num_waves);
+-   ctx.num_waves = max_suitable_waves(program, ctx.num_waves);
+-
+-   assert(ctx.num_waves >= program->min_waves);
+-   ctx.mv.max_registers = get_addr_regs_from_waves(program, ctx.num_waves);
++
++   const int wave_factor = program->gfx_level >= GFX10 ? 2 : 1;
++   const float reg_file_multiple = program->dev.physical_vgprs / (256.0 * wave_factor);
++   const int wave_minimum = std::max<int>(program->min_waves, 4 * wave_factor * reg_file_multiple);
++
++   /* If we already have less waves than the minimum, don't reduce them further.
++    * Otherwise, sacrifice some waves and use more VGPRs, in order to improve scheduling.
++    */
++   int vpgr_demand = std::max<int>(24, demand.vgpr) + 12 * reg_file_multiple;
++   int target_waves = std::max(wave_minimum, program->dev.physical_vgprs / vpgr_demand);
++   target_waves = max_suitable_waves(program, std::min<int>(program->num_waves, target_waves));
++   assert(target_waves >= program->min_waves);
++
++   ctx.mv.max_registers = get_addr_regs_from_waves(program, target_waves);
+    ctx.mv.max_registers.vgpr -= 2;
+ 
+    /* VMEM_MAX_MOVES and such assume pre-GFX10 wave count */
+-   ctx.num_waves = std::max<uint16_t>(ctx.num_waves / wave_fac, 1);
++   ctx.occupancy_factor = target_waves / wave_factor;
+ 
+    /* NGG culling shaders are very sensitive to position export scheduling.
+     * Schedule less aggressively when early primitive export is used, and
diff --git a/files/nixpkgs-patches/399384.diff b/files/nixpkgs-patches/399384.diff
new file mode 100644
index 0000000..f5737f5
--- /dev/null
+++ b/files/nixpkgs-patches/399384.diff
@@ -0,0 +1,21 @@
+diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
+index 496f74440aad98..91624d6d4bfc03 100644
+--- a/pkgs/development/libraries/mesa/common.nix
++++ b/pkgs/development/libraries/mesa/common.nix
+@@ -5,14 +5,14 @@
+ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
+ rec {
+   pname = "mesa";
+-  version = "25.0.3";
++  version = "25.0.4";
+ 
+   src = fetchFromGitLab {
+     domain = "gitlab.freedesktop.org";
+     owner = "mesa";
+     repo = "mesa";
+     rev = "mesa-${version}";
+-    hash = "sha256-OM/T6pkq4vgEYZ7TlLRVsyMknLxQC9L+iOPF20ToZi8=";
++    hash = "sha256-TiMd1YVQxOlrmdwDQDoTFh6nbVMfnW75ISfzoUQgKHU=";
+   };
+ 
+   meta = {
diff --git a/files/nixpkgs-patches/399388.diff b/files/nixpkgs-patches/399388.diff
new file mode 100644
index 0000000..41f6ebe
--- /dev/null
+++ b/files/nixpkgs-patches/399388.diff
@@ -0,0 +1,269 @@
+diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
+index 91624d6d4bfc03..0332e1a5b22bb6 100644
+--- a/pkgs/development/libraries/mesa/common.nix
++++ b/pkgs/development/libraries/mesa/common.nix
+@@ -5,14 +5,14 @@
+ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
+ rec {
+   pname = "mesa";
+-  version = "25.0.4";
++  version = "25.1.0-rc1";
+ 
+   src = fetchFromGitLab {
+     domain = "gitlab.freedesktop.org";
+     owner = "mesa";
+     repo = "mesa";
+     rev = "mesa-${version}";
+-    hash = "sha256-TiMd1YVQxOlrmdwDQDoTFh6nbVMfnW75ISfzoUQgKHU=";
++    hash = "sha256-vQrTGGhIfy41uaCQ4rg+ZlCp43qI1wMK6QIrGKr4+Ts=";
+   };
+ 
+   meta = {
+diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
+index 255cda5a742372..4994c83e680676 100644
+--- a/pkgs/development/libraries/mesa/default.nix
++++ b/pkgs/development/libraries/mesa/default.nix
+@@ -103,8 +103,10 @@
+   ],
+   vulkanLayers ? [
+     "device-select"
+-    "overlay"
+     "intel-nullhw"
++    "overlay"
++    "screenshot"
++    "vram-report-limit"
+   ],
+   mesa,
+   mesa-gl-headers,
+@@ -161,7 +163,6 @@ stdenv.mkDerivation {
+ 
+   patches = [
+     ./opencl.patch
+-    ./system-gbm.patch
+   ];
+ 
+   postPatch = ''
+@@ -223,7 +224,6 @@ stdenv.mkDerivation {
+       (lib.mesonBool "libgbm-external" true)
+ 
+       (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK
+-      (lib.mesonBool "osmesa" false) # deprecated upstream
+ 
+       # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver,
+       # so we're keeping it for now. Should be removed when that's no longer the case.
+diff --git a/pkgs/development/libraries/mesa/opencl.patch b/pkgs/development/libraries/mesa/opencl.patch
+index 8444237d3d5418..9d40da82f85649 100644
+--- a/pkgs/development/libraries/mesa/opencl.patch
++++ b/pkgs/development/libraries/mesa/opencl.patch
+@@ -13,8 +13,8 @@ index c150bff74ff..37fa7f0531b 100644
+  
+ diff --git a/meson_options.txt b/meson_options.txt
+ index 82324617884..4bde97a8568 100644
+---- a/meson_options.txt
+-+++ b/meson_options.txt
++--- a/meson.options
+++++ b/meson.options
+ @@ -738,3 +738,10 @@ option(
+      'none', 'dri2'
+    ],
+diff --git a/pkgs/development/libraries/mesa/system-gbm.patch b/pkgs/development/libraries/mesa/system-gbm.patch
+deleted file mode 100644
+index 7f16ff7469c757..00000000000000
+--- a/pkgs/development/libraries/mesa/system-gbm.patch
++++ /dev/null
+@@ -1,195 +0,0 @@
+-commit 69914d79c3d86b0aee80665c51074cf8cc55f660
+-Author: K900 <me@0upti.me>
+-Date:   2025-03-05 13:14:02 +0300
+-
+-    meson: support building with system libgbm
+-    
+-    This is the next step towards making libgbm just a loader.
+-
+-diff --git a/meson.build b/meson.build
+-index 4766ce838ba..300a6bb0cc8 100644
+---- a/meson.build
+-+++ b/meson.build
+-@@ -2377,7 +2377,7 @@ summary(egl_summary, section: 'EGL', bool_yn: true, list_sep: ' ')
+- 
+- gbm_summary = {'Enabled': with_gbm}
+- if with_gbm
+--  gbm_summary += {'Backends path': gbm_backends_path}
+-+  gbm_summary += {'External libgbm': get_option('libgbm-external'), 'Backends path': gbm_backends_path}
+- endif
+- summary(gbm_summary, section: 'GBM', bool_yn: true, list_sep: ' ')
+- 
+-diff --git a/meson_options.txt b/meson_options.txt
+-index 2622cf1d235..7bf8ae8a1c5 100644
+---- a/meson_options.txt
+-+++ b/meson_options.txt
+-@@ -329,6 +329,13 @@ option(
+-   description : 'Build support for gbm platform'
+- )
+- 
+-+option(
+-+  'libgbm-external',
+-+  type: 'boolean',
+-+  value: false,
+-+  description: 'Whether to use external libgbm (default: use in-tree copy)'
+-+)
+-+
+- option(
+-   'gbm-backends-path',
+-   type : 'string',
+-diff --git a/src/egl/meson.build b/src/egl/meson.build
+-index a02b83419c4..ae4b0c5e063 100644
+---- a/src/egl/meson.build
+-+++ b/src/egl/meson.build
+-@@ -108,9 +108,8 @@ if with_dri
+-   endif
+-   if with_gbm and not with_platform_android
+-     files_egl += files('drivers/dri2/platform_drm.c')
+--    link_for_egl += libgbm
+--    incs_for_egl += [inc_gbm, include_directories('../gbm/main')]
+--    deps_for_egl += dep_libdrm
+-+    incs_for_egl += [include_directories('../gbm/backends/dri')]
+-+    deps_for_egl += [dep_libdrm, dep_gbm]
+-   endif
+-   if with_platform_wayland
+-     deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers]
+-diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
+-index 339e9376c3d..f1a0bb18ed8 100644
+---- a/src/gallium/targets/dril/dril_target.c
+-+++ b/src/gallium/targets/dril/dril_target.c
+-@@ -25,7 +25,7 @@
+- #include <dlfcn.h>
+- #include <EGL/egl.h>
+- #include <EGL/eglext.h>
+--#include "gbm/main/gbm.h"
+-+#include <gbm.h>
+- #include "drm-uapi/drm_fourcc.h"
+- 
+- #define EGL_PLATFORM_GBM_MESA             0x31D7
+-diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build
+-index 7cfa982ffe1..22b955b9074 100644
+---- a/src/gallium/targets/dril/meson.build
+-+++ b/src/gallium/targets/dril/meson.build
+-@@ -51,10 +51,10 @@ dril_dri = shared_library(
+-   link_depends : dril_link_depends,
+-   link_with : [
+-     libgallium,
+--    libgbm,
+-   ],
+-   dependencies : [
+-     idep_mesautil,
+-+    dep_gbm,
+-   ],
+-   # Will be deleted during installation, see install_megadrivers.py
+-   install : true,
+-diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
+-index a51e3cb3b8d..f1a5e0f7649 100644
+---- a/src/gbm/backends/dri/gbm_dri.c
+-+++ b/src/gbm/backends/dri/gbm_dri.c
+-@@ -43,7 +43,7 @@
+- 
+- #include "mesa_interface.h"
+- #include "gbm_driint.h"
+--#include "gbmint.h"
+-+#include <gbm_backend_abi.h>
+- #include "loader_dri_helper.h"
+- #include "kopper_interface.h"
+- #include "loader.h"
+-diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h
+-index 9b324aeaf12..9c7588e5726 100644
+---- a/src/gbm/backends/dri/gbm_driint.h
+-+++ b/src/gbm/backends/dri/gbm_driint.h
+-@@ -31,7 +31,7 @@
+- #include <xf86drm.h>
+- #include <string.h>
+- #include <sys/mman.h>
+--#include "gbmint.h"
+-+#include <gbm_backend_abi.h>
+- #include "c11/threads.h"
+- 
+- #include <GL/gl.h> /* mesa_interface needs GL types */
+-diff --git a/src/gbm/backends/dri/meson.build b/src/gbm/backends/dri/meson.build
+-index 9b5d13e9db8..84a40656980 100644
+---- a/src/gbm/backends/dri/meson.build
+-+++ b/src/gbm/backends/dri/meson.build
+-@@ -11,10 +11,10 @@ endif
+- shared_library(
+-   'dri_gbm',
+-   files('gbm_dri.c', 'gbm_driint.h'),
+--  include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux],
+-+  include_directories : [inc_gallium, incs_gbm_dri, inc_loader, inc_st_dri, inc_gallium_aux],
+-   link_args : [ld_args_gc_sections],
+-   link_with : [libloader, libgallium_dri],
+--  dependencies : [deps_gbm_dri, dep_dl, dep_libdrm, idep_mesautil, idep_xmlconfig],
+-+  dependencies : [deps_gbm_dri, dep_dl, dep_gbm, dep_libdrm, idep_mesautil, idep_xmlconfig],
+-   gnu_symbol_visibility : 'hidden',
+-   install : true,
+-   install_dir: join_paths(get_option('libdir'), 'gbm'),
+-diff --git a/src/gbm/meson.build b/src/gbm/meson.build
+-index eaed028d049..97e8d5fa044 100644
+---- a/src/gbm/meson.build
+-+++ b/src/gbm/meson.build
+-@@ -15,10 +15,6 @@ args_gbm = [
+- ]
+- incs_gbm = [include_directories('main'), inc_loader, inc_gallium]
+- 
+--if with_dri2
+--  subdir('backends/dri')
+--endif
+--
+- libgbm_name = 'gbm'
+- 
+- if with_platform_android and get_option('platform-sdk-version') >= 30
+-@@ -43,7 +39,7 @@ if with_tests
+-   test('gbm-abi-check', abi_check, suite : ['gbm'])
+- endif
+- 
+--install_headers('main/gbm.h')
+-+install_headers('main/gbm.h', 'main/gbm_backend_abi.h')
+- 
+- pkg.generate(
+-   name : 'gbm',
+-@@ -67,3 +63,8 @@ if with_symbols_check
+-     suite : ['gbm'],
+-   )
+- endif
+-+
+-+dep_gbm = declare_dependency(
+-+  link_with : libgbm,
+-+  include_directories : inc_gbm,
+-+)
+-diff --git a/src/meson.build b/src/meson.build
+-index d443d2b41bb..74250ed2148 100644
+---- a/src/meson.build
+-+++ b/src/meson.build
+-@@ -127,11 +127,17 @@ endif
+- if with_glx == 'dri'
+-   subdir('glx')
+- endif
+-+
+- if with_gbm
+--  subdir('gbm')
+-+  if get_option('libgbm-external')
+-+    dep_gbm = dependency('gbm')
+-+  else
+-+    subdir('gbm')
+-+  endif
+- else
+--  inc_gbm = []
+-+  dep_gbm = null_dep
+- endif
+-+
+- if with_egl
+-   subdir('egl')
+- endif
+-@@ -141,6 +147,10 @@ if with_gallium and with_gbm
+-   endif
+- endif
+- 
+-+if with_gbm and with_dri2
+-+  subdir('gbm/backends/dri')
+-+endif
+-+
+- # This must be after at least mesa, glx, and gallium, since libgl will be
+- # defined in one of those subdirs depending on the glx provider.
+- if with_glx != 'disabled' and not with_glvnd
diff --git a/files/nixpkgs-patches/f57f3d99091a105cbd9484c33264558785efc4be.diff b/files/nixpkgs-patches/f57f3d99091a105cbd9484c33264558785efc4be.diff
deleted file mode 100644
index 86100d5..0000000
--- a/files/nixpkgs-patches/f57f3d99091a105cbd9484c33264558785efc4be.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/docs/changelog.rst b/docs/changelog.rst
-index 502ee01193..b20c1a39f0 100644
---- a/docs/changelog.rst
-+++ b/docs/changelog.rst
-@@ -110,6 +110,9 @@ Detailed list of changes
- - Fix a regression in version 0.40.0 causing a crash when the underline
-   thickness of the font is zero (:iss:`8443`)
- 
-+- Fix a regression in version 0.40.0 causing a hang on resizing with a wide
-+  character at the right edge of a line that needs to be moved onto the next
-+  line (:iss:`8464`)
- 
- 0.40.1 [2025-03-18]
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-diff --git a/kitty/resize.c b/kitty/resize.c
-index 78980b7886..280495fab3 100644
---- a/kitty/resize.c
-+++ b/kitty/resize.c
-@@ -228,7 +228,7 @@ multiline_copy_src_to_dest(Rewrap *r) {
- 
- static void
- fast_copy_src_to_dest(Rewrap *r) {
--    CPUCell *c; index_type mc_width;
-+    CPUCell *c;
-     while (r->src.x < r->src_x_limit) {
-         if (r->dest.x >= dest_xnum) {
-             next_dest_line(r, true);
-@@ -238,17 +238,10 @@ fast_copy_src_to_dest(Rewrap *r) {
-             }
-         }
-         index_type num = MIN(r->src_x_limit - r->src.x, dest_xnum - r->dest.x);
--        if (num && (c = &r->src.line.cpu_cells[r->src.x + num - 1])->is_multicell && c->x != (mc_width = mcd_x_limit(c)) - 1) {
-+        if (num && (c = &r->src.line.cpu_cells[r->src.x + num - 1])->is_multicell && c->x != mcd_x_limit(c) - 1) {
-             // we have a split multicell at the right edge of the copy region
--            if (num > mc_width) num = MIN(r->src_x_limit - r->src.x - mc_width, num);
--            else {
--                if (mc_width > dest_xnum) {
--                    multiline_copy_src_to_dest(r);
--                    return;
--                }
--                r->dest.x = dest_xnum;
--                continue;
--            }
-+            multiline_copy_src_to_dest(r);
-+            return;
-         }
-         copy_range(&r->src.line, r->src.x, &r->dest.line, r->dest.x, num);
-         update_tracked_cursors(r, num, r->src.y, r->dest.y, r->src_x_limit);
-diff --git a/kitty_tests/multicell.py b/kitty_tests/multicell.py
-index 63e9892b81..94c2010c9f 100644
---- a/kitty_tests/multicell.py
-+++ b/kitty_tests/multicell.py
-@@ -98,6 +98,11 @@ def assert_line(text, y=None):
-     def assert_cursor_at(x, y):
-         self.ae((s.cursor.x, s.cursor.y), (x, y))
- 
-+    s = self.create_screen(cols=8, lines=4)
-+    s.draw('飛青進服三上')
-+    s.resize(s.lines, 5)
-+    self.ae('飛青', str(s.line(0)))
-+
-     s = self.create_screen(cols=6, lines=6)
- 
-     # Test basic multicell drawing
diff --git a/files/nixpkgs-patches/minus_screenshot.diff b/files/nixpkgs-patches/minus_screenshot.diff
new file mode 100644
index 0000000..1c014d9
--- /dev/null
+++ b/files/nixpkgs-patches/minus_screenshot.diff
@@ -0,0 +1,12 @@
+diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
+index d113b66cb..ea7f072c8 100644
+--- a/pkgs/development/libraries/mesa/default.nix
++++ b/pkgs/development/libraries/mesa/default.nix
+@@ -105,7 +105,6 @@
+     "device-select"
+     "intel-nullhw"
+     "overlay"
+-    "screenshot"
+     "vram-report-limit"
+   ],
+   mesa,
diff --git a/files/nvim/init.vim b/files/nvim/init.vim
index 35a55b9..56af917 100644
--- a/files/nvim/init.vim
+++ b/files/nvim/init.vim
@@ -177,8 +177,8 @@ nmap <silent> <C-o> :vsplit<CR>
 nmap <C-,> <C-^>
 nmap <C-.> <C-^>
 " Swap ctrl + f and b.
-nnoremap <C-b> <C-f>
-nnoremap <C-f> <C-b>
+"nnoremap <C-b> <C-f>
+"nnoremap <C-f> <C-b>
 " Toggle colorcolumn.
 nmap <silent> C :execute 'set colorcolumn=' . (&colorcolumn == '' ? '101' : '')<CR>
 " Personally intuitive pop-up menu binds.
diff --git a/flake.lock b/flake.lock
index 7553229..687391d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -14,11 +14,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743463234,
-        "narHash": "sha256-R3XjF+CQaIyk7YZYj06wIcE+zhb4HpZBehumUy4pfCI=",
+        "lastModified": 1745695466,
+        "narHash": "sha256-i8LY+i7taSJAbxG4xWWz04MgR/fbPBLzsM5C2Wa45hg=",
         "ref": "refs/heads/master",
-        "rev": "a9667e44efb204846092ec65beb2673c7f998889",
-        "revCount": 108,
+        "rev": "61492af23ecc5dd9ab4956a84a7c0451deb8b84b",
+        "revCount": 118,
         "type": "git",
         "url": "https://git.akon.city/camu"
       },
@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743438213,
-        "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=",
+        "lastModified": 1745627989,
+        "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ccd7df836e1f42ea84806760f25b77b586370259",
+        "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1743420942,
-        "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
+        "lastModified": 1745503349,
+        "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
+        "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1743125458,
-        "narHash": "sha256-0z+5AMacL2Eqo92fAd0eCWeKVecWrxPJwd5/BIfcdJ8=",
+        "lastModified": 1744290088,
+        "narHash": "sha256-/X9XVEl0EiyisNbF5srrxXRSVoRqdwExuqyspYqqEjQ=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "394c77f61ac76399290bfc2ef9d47b1fba31b215",
+        "rev": "60b4904a1390ac4c89e93d95f6ed928975e525ed",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740865531,
-        "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
+        "lastModified": 1742937945,
+        "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
+        "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
         "type": "github"
       },
       "original": {
@@ -176,11 +176,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1743315132,
-        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
+        "lastModified": 1745526057,
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743472829,
-        "narHash": "sha256-r43stBd6qx6oTSidM4zpTl6WrIxwIB9DKHTu3Y9+P8c=",
+        "lastModified": 1745696698,
+        "narHash": "sha256-GTp4lsii7PA294/SXvRXtEl+cjHyJCDsiXRlIUABC54=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f80cb1507bdf2051df68ce49bd2010b10345184d",
+        "rev": "effaeb3c6ca87b43f66e1ff63fc76af52f7ba8c2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 399779a..2f8fbc7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -126,6 +126,8 @@
         name = "nixpkgs-patched";
         src = nixpkgs;
         patches = [
+          ./files/nixpkgs-patches/399388.diff
+          ./files/nixpkgs-patches/minus_screenshot.diff
         ];
       };
       nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix");
@@ -138,7 +140,7 @@
           (self: super: {
             asNeeded = (pkg: commands:
               (lib.lists.forEach commands (command: super.writeShellScriptBin "${command}" ''
-                install-as-needed "${pkg}" ${command} ''$@
+                install-as-needed "${pkg}" ${command} "$@"
               ''))
             );
           })
@@ -154,7 +156,6 @@
           (self: super: {
             kitty = (optimizeWithFlags super.kitty "-O3 -march=znver2 -mtune=znver2 -fno-semantic-interposition").overrideAttrs (old: {
               patches = old.patches ++ [
-                ./files/nixpkgs-patches/f57f3d99091a105cbd9484c33264558785efc4be.diff
               ];
             });
           })
@@ -196,12 +197,13 @@
               });
             });
           })
-          #(self: super: {
-          #  mesa = super.mesa.overrideAttrs (old: {
-          #    patches = old.patches ++ [
-          #    ];
-          #  });
-          #})
+          (self: super: {
+            mesa = super.mesa.overrideAttrs (old: {
+              patches = old.patches ++ [
+                ./files/nixpkgs-patches/30720.diff
+              ];
+            });
+          })
           (self: super: {
             dia = super.dia.overrideAttrs (old: {
               nativeBuildInputs = with super; [
diff --git a/hosts/iroha/gentoo/make.conf b/hosts/iroha/gentoo/make.conf
index 0d0da3e..f83b6b4 100644
--- a/hosts/iroha/gentoo/make.conf
+++ b/hosts/iroha/gentoo/make.conf
@@ -20,8 +20,8 @@ RUBY_TARGETS="ruby32"
 
 PERL_FEATURES=""
 
-LUA_SINGLE_TARGET="luajit"
-LUA_TARGETS="luajit"
+LUA_SINGLE_TARGET="lua5-4"
+LUA_TARGETS="lua5-4"
 
 KERNEL="linux"
 
diff --git a/hosts/iroha/gentoo/package.accept_keywords/samba b/hosts/iroha/gentoo/package.accept_keywords/samba
new file mode 100644
index 0000000..90d7b6d
--- /dev/null
+++ b/hosts/iroha/gentoo/package.accept_keywords/samba
@@ -0,0 +1 @@
+net-fs/samba ~amd64
diff --git a/hosts/iroha/gentoo/package.accept_keywords/talloc b/hosts/iroha/gentoo/package.accept_keywords/talloc
new file mode 100644
index 0000000..f08e38b
--- /dev/null
+++ b/hosts/iroha/gentoo/package.accept_keywords/talloc
@@ -0,0 +1 @@
+sys-libs/talloc ~amd64
diff --git a/hosts/iroha/gentoo/package.accept_keywords/tdb b/hosts/iroha/gentoo/package.accept_keywords/tdb
new file mode 100644
index 0000000..4b53952
--- /dev/null
+++ b/hosts/iroha/gentoo/package.accept_keywords/tdb
@@ -0,0 +1 @@
+sys-libs/tdb ~amd64
diff --git a/hosts/iroha/gentoo/package.accept_keywords/tevent b/hosts/iroha/gentoo/package.accept_keywords/tevent
new file mode 100644
index 0000000..924bdcc
--- /dev/null
+++ b/hosts/iroha/gentoo/package.accept_keywords/tevent
@@ -0,0 +1 @@
+sys-libs/tevent ~amd64
diff --git a/hosts/iroha/gentoo/package.use/binutils-libs b/hosts/iroha/gentoo/package.use/binutils-libs
new file mode 100644
index 0000000..d2d9d0d
--- /dev/null
+++ b/hosts/iroha/gentoo/package.use/binutils-libs
@@ -0,0 +1 @@
+sys-libs/binutils-libs -cet
diff --git a/hosts/iroha/gentoo/package.use/edk2-bin b/hosts/iroha/gentoo/package.use/edk2-bin
new file mode 100644
index 0000000..dbc8f1b
--- /dev/null
+++ b/hosts/iroha/gentoo/package.use/edk2-bin
@@ -0,0 +1 @@
+sys-firmware/edk2-bin -secureboot
diff --git a/hosts/iroha/gentoo/package.use/librsvg b/hosts/iroha/gentoo/package.use/librsvg
new file mode 100644
index 0000000..415215d
--- /dev/null
+++ b/hosts/iroha/gentoo/package.use/librsvg
@@ -0,0 +1 @@
+gnome-base/librsvg -vala
diff --git a/hosts/iroha/gentoo/package.use/ntp b/hosts/iroha/gentoo/package.use/ntp
new file mode 100644
index 0000000..2f6b4b4
--- /dev/null
+++ b/hosts/iroha/gentoo/package.use/ntp
@@ -0,0 +1 @@
+net-misc/ntp samba
diff --git a/hosts/iroha/gentoo/package.use/nvidia-drivers b/hosts/iroha/gentoo/package.use/nvidia-drivers
index 502813d..254f65f 100644
--- a/hosts/iroha/gentoo/package.use/nvidia-drivers
+++ b/hosts/iroha/gentoo/package.use/nvidia-drivers
@@ -1 +1 @@
-x11-drivers/nvidia-drivers -X -wayland -multilib -abi_x86_32 kms -gtk3 -tools -compat uvm
+x11-drivers/nvidia-drivers tools powerd -X -wayland -multilib -gtk3 -compat -abi_x86_32
diff --git a/hosts/iroha/gentoo/package.use/pipewire b/hosts/iroha/gentoo/package.use/pipewire
new file mode 100644
index 0000000..90c2128
--- /dev/null
+++ b/hosts/iroha/gentoo/package.use/pipewire
@@ -0,0 +1 @@
+media-video/pipewire pipewire-alsa sound-server
diff --git a/hosts/iroha/gentoo/package.use/qemu b/hosts/iroha/gentoo/package.use/qemu
index a28cb17..ea27a26 100644
--- a/hosts/iroha/gentoo/package.use/qemu
+++ b/hosts/iroha/gentoo/package.use/qemu
@@ -1 +1 @@
-app-emulation/qemu -doc pin-upstream-blobs -gnutls -sdl -gtk io-uring jemalloc iscsi opengl spice usb usbredir virgl virtfs -vnc -ncurses -oss -png QEMU_SOFTMMU_TARGETS: aarch64 x86_64 m68k i386
+app-emulation/qemu -doc pin-upstream-blobs -gnutls -sdl -gtk io-uring jemalloc iscsi opengl spice usb usbredir virgl virtfs vnc gnutls -ncurses -oss -png QEMU_SOFTMMU_TARGETS: aarch64 x86_64 m68k i386
diff --git a/hosts/iroha/gentoo/package.use/spice b/hosts/iroha/gentoo/package.use/spice
new file mode 100644
index 0000000..c185229
--- /dev/null
+++ b/hosts/iroha/gentoo/package.use/spice
@@ -0,0 +1 @@
+app-emulation/spice lz4
diff --git a/hosts/iroha/gentoo/package.use/zz-autounmask b/hosts/iroha/gentoo/package.use/zz-autounmask
index ffec071..d49b2bb 100644
--- a/hosts/iroha/gentoo/package.use/zz-autounmask
+++ b/hosts/iroha/gentoo/package.use/zz-autounmask
@@ -20,3 +20,19 @@
 # required by @selected
 # required by @world (argument)
 >=net-dns/bind-9.18.29-r2 idn
+# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools]
+# required by nvidia-drivers (argument)
+>=x11-libs/gtk+-3.24.42-r1 X
+# required by x11-libs/pango-1.52.2::gentoo
+# required by x11-libs/gtk+-3.24.42-r1::gentoo
+# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools]
+# required by nvidia-drivers (argument)
+>=media-libs/harfbuzz-10.1.0 truetype glib
+# required by x11-libs/gtk+-3.24.42-r1::gentoo
+# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools]
+# required by nvidia-drivers (argument)
+>=media-libs/libepoxy-1.5.10-r3 X
+# required by x11-libs/gtk+-3.24.42-r1::gentoo
+# required by x11-drivers/nvidia-drivers-550.142::gentoo[tools]
+# required by nvidia-drivers (argument)
+>=x11-libs/cairo-1.18.2-r1 X
diff --git a/hosts/iroha/grub_config b/hosts/iroha/grub_config
index dced1d3..389a039 100644
--- a/hosts/iroha/grub_config
+++ b/hosts/iroha/grub_config
@@ -30,7 +30,7 @@ GRUB_CMDLINE_LINUX="quiet text rd.lvm.vg=iroha-vg0"
 
 # Append parameters to the linux kernel command line for non-recovery entries
 # default_hugepagesz=1G hugepagesz=1G hugepages=48
-GRUB_CMDLINE_LINUX_DEFAULT="nowatchdog nmi_watchdog=0 amd_pstate=guided amd_iommu=on iommu=pt kvm.ignore_msrs=1 kvm.report_ignored_msrs=0 pcie_no_flr=1022:149c acpi_enforce_resources=lax amdgpu.ppfeaturemask=0xffffffff i915.force_probe=!56a0 xe.force_probe=56a0 psi=1 mitigations=off"
+GRUB_CMDLINE_LINUX_DEFAULT="nowatchdog nmi_watchdog=0 amd_pstate=guided amd_iommu=on iommu=pt pcie_no_flr=1022:149c acpi_enforce_resources=lax amdgpu.ppfeaturemask=0xffffffff i915.force_probe=56a0 xe.force_probe=!56a0 psi=1 mitigations=off"
 
 # Uncomment to disable graphical terminal (grub-pc only)
 #GRUB_TERMINAL=console
diff --git a/hosts/iroha/kernel_config b/hosts/iroha/kernel_config
index 3fbb776..8742801 100644
--- a/hosts/iroha/kernel_config
+++ b/hosts/iroha/kernel_config
@@ -1,18 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.8-gentoo Kernel Configuration
+# Linux/x86 6.14.4-gentoo Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.2.1_p20241221 p7) 14.2.1 20241221"
+CONFIG_CC_VERSION_TEXT="gcc (Gentoo 15.1.0 p55) 15.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140201
+CONFIG_GCC_VERSION=150100
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24301
+CONFIG_AS_VERSION=24400
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24301
+CONFIG_LD_VERSION=24400
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108200
-CONFIG_RUSTC_LLVM_VERSION=190101
+CONFIG_RUSTC_VERSION=108501
+CONFIG_RUSTC_LLVM_VERSION=190107
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -20,7 +20,10 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=127
+CONFIG_CC_HAS_COUNTED_BY=y
+CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
+CONFIG_RUSTC_HAS_COERCE_POINTEE=y
+CONFIG_PAHOLE_VERSION=129
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -79,7 +82,6 @@ CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
 CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
 # end of IRQ subsystem
 
 CONFIG_CLOCKSOURCE_WATCHDOG=y
@@ -92,7 +94,6 @@ CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
 CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
-# CONFIG_TIME_KUNIT_TEST is not set
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_CONTEXT_TRACKING_IDLE=y
 
@@ -128,9 +129,11 @@ CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # end of BPF subsystem
 
 CONFIG_PREEMPT_BUILD=y
+CONFIG_ARCH_HAS_PREEMPT_LAZY=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_LAZY is not set
 # CONFIG_PREEMPT_RT is not set
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
@@ -177,7 +180,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-# CONFIG_PRINTK_INDEX is not set
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 
 #
@@ -213,6 +215,7 @@ CONFIG_EXT_GROUP_SCHED=y
 CONFIG_SCHED_MM_CID=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
+# CONFIG_CGROUP_DMEM is not set
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
@@ -350,7 +353,6 @@ CONFIG_X86_CPU_RESCTRL=y
 # CONFIG_X86_INTEL_LPSS is not set
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
 CONFIG_IOSF_MBI=m
-# CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
@@ -397,7 +399,8 @@ CONFIG_MZEN2=y
 # CONFIG_MSKYLAKE is not set
 # CONFIG_MSKYLAKEX is not set
 # CONFIG_MCANNONLAKE is not set
-# CONFIG_MICELAKE is not set
+# CONFIG_MICELAKE_CLIENT is not set
+# CONFIG_MICELAKE_SERVER is not set
 # CONFIG_MCASCADELAKE is not set
 # CONFIG_MCOOPERLAKE is not set
 # CONFIG_MTIGERLAKE is not set
@@ -450,7 +453,6 @@ CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_INTEL is not set
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
 
 #
 # Performance monitoring
@@ -473,7 +475,6 @@ CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 # CONFIG_X86_5LEVEL is not set
 CONFIG_X86_DIRECT_GBPAGES=y
-# CONFIG_X86_CPA_STATISTICS is not set
 # CONFIG_AMD_MEM_ENCRYPT is not set
 # CONFIG_NUMA is not set
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -538,6 +539,7 @@ CONFIG_LEGACY_VSYSCALL_NONE=y
 CONFIG_MODIFY_LDT_SYSCALL=y
 # CONFIG_STRICT_SIGALTSTACK_SIZE is not set
 CONFIG_HAVE_LIVEPATCH=y
+CONFIG_X86_BUS_LOCK_DETECT=y
 # end of Processor type and features
 
 CONFIG_CC_HAS_NAMED_AS=y
@@ -586,6 +588,7 @@ CONFIG_ACPI_SPCR_TABLE=y
 CONFIG_ACPI_LPIT=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_AC is not set
 # CONFIG_ACPI_BATTERY is not set
@@ -687,6 +690,7 @@ CONFIG_MMCONF_FAM10H=y
 # CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
+CONFIG_AMD_NODE=y
 # end of Bus options (PCI etc.)
 
 #
@@ -716,12 +720,13 @@ CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
 CONFIG_KVM_COMPAT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=m
 CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_HAVE_KVM_PM_NOTIFIER=y
 CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
 CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
+CONFIG_KVM_ELIDE_TLB_FLUSH_IF_YOUNG=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM_X86=m
 CONFIG_KVM=m
@@ -823,6 +828,8 @@ CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_AUTOFDO_CLANG=y
+CONFIG_ARCH_SUPPORTS_PROPELLER_CLANG=y
 CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
@@ -877,7 +884,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_HAVE_STATIC_CALL=y
 CONFIG_HAVE_STATIC_CALL_INLINE=y
@@ -896,7 +902,6 @@ CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
 #
 # GCOV-based kernel profiling
 #
-# CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
@@ -912,7 +917,6 @@ CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 
 CONFIG_RT_MUTEXES=y
 CONFIG_MODULES=y
-# CONFIG_MODULE_DEBUG is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
@@ -943,7 +947,6 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
 # CONFIG_BLK_CGROUP_IOPRIO is not set
-CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_SED_OPAL is not set
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
 
@@ -1050,7 +1053,10 @@ CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_MEMORY_HOTPLUG=y
-# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_MHP_DEFAULT_ONLINE_TYPE_OFFLINE=y
+# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO is not set
+# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_KERNEL is not set
+# CONFIG_MHP_DEFAULT_ONLINE_TYPE_ONLINE_MOVABLE is not set
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MHP_MEMMAP_ON_MEMORY=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
@@ -1110,7 +1116,10 @@ CONFIG_ARCH_HAS_PKEYS=y
 CONFIG_ARCH_USES_PG_ARCH_2=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_TEST is not set
+
+#
+# GUP_TEST needs to have DEBUG_FS enabled
+#
 # CONFIG_DMAPOOL_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MEMFD_CREATE=y
@@ -1126,6 +1135,8 @@ CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
 CONFIG_IOMMU_MM_DATA=y
 CONFIG_EXECMEM=y
+CONFIG_ARCH_SUPPORTS_PT_RECLAIM=y
+CONFIG_PT_RECLAIM=y
 
 #
 # Data Access Monitoring
@@ -1162,9 +1173,9 @@ CONFIG_XFRM_AH=m
 CONFIG_XFRM_ESP=m
 CONFIG_XFRM_IPCOMP=m
 # CONFIG_NET_KEY is not set
+# CONFIG_XFRM_IPTFS is not set
 # CONFIG_XDP_SOCKETS is not set
 CONFIG_NET_HANDSHAKE=y
-# CONFIG_NET_HANDSHAKE_KUNIT_TEST is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -1358,11 +1369,13 @@ CONFIG_NETFILTER_XT_NAT=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
@@ -1499,8 +1512,9 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_RAW is not set
+CONFIG_IP_NF_RAW=m
 # CONFIG_IP_NF_SECURITY is not set
+# CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_ARPFILTER is not set
 # end of IP: Netfilter Configuration
 
@@ -1533,7 +1547,7 @@ CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
 CONFIG_IP6_NF_MANGLE=m
-# CONFIG_IP6_NF_RAW is not set
+CONFIG_IP6_NF_RAW=m
 # CONFIG_IP6_NF_SECURITY is not set
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -1660,7 +1674,7 @@ CONFIG_NET_ACT_POLICE=m
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_SIMP is not set
 # CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_CSUM is not set
+CONFIG_NET_ACT_CSUM=m
 # CONFIG_NET_ACT_MPLS is not set
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
@@ -1725,7 +1739,6 @@ CONFIG_BT_LE_L2CAP_ECRED=y
 # CONFIG_BT_LEDS is not set
 # CONFIG_BT_MSFTEXT is not set
 # CONFIG_BT_AOSPEXT is not set
-CONFIG_BT_DEBUGFS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BT_FEATURE_DEBUG is not set
 
@@ -1739,6 +1752,7 @@ CONFIG_BT_MTK=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
 CONFIG_BT_HCIBTUSB_POLL_SYNC=y
+# CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT is not set
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -1770,10 +1784,8 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
 CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 # CONFIG_CFG80211_WEXT is not set
-# CONFIG_CFG80211_KUNIT_TEST is not set
 # CONFIG_MAC80211 is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 CONFIG_RFKILL=m
@@ -1795,14 +1807,10 @@ CONFIG_PAGE_POOL=y
 CONFIG_PAGE_POOL_STATS=y
 CONFIG_FAILOVER=m
 CONFIG_ETHTOOL_NETLINK=y
-# CONFIG_NETDEV_ADDR_LIST_TEST is not set
-# CONFIG_NET_TEST is not set
 
 #
 # Device Drivers
 #
-CONFIG_HAVE_EISA=y
-# CONFIG_EISA is not set
 CONFIG_HAVE_PCI=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_PCI=y
@@ -1830,6 +1838,7 @@ CONFIG_PCI_LOCKLESS_CONFIG=y
 # CONFIG_PCI_NPEM is not set
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
+# CONFIG_PCIE_TPH is not set
 # CONFIG_PCI_P2PDMA is not set
 CONFIG_PCI_LABEL=y
 # CONFIG_PCIE_BUS_TUNE_OFF is not set
@@ -1842,6 +1851,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_ACPI is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_OCTEONEP is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
 #
@@ -1921,14 +1931,10 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-# CONFIG_DM_KUNIT_TEST is not set
-# CONFIG_DRIVER_PE_KUNIT_TEST is not set
 CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
-# CONFIG_REGMAP_KUNIT is not set
-# CONFIG_REGMAP_BUILD is not set
 CONFIG_REGMAP_I2C=m
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
@@ -1989,8 +1995,6 @@ CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_COCO_SECRET is not set
 # end of EFI (Extensible Firmware Interface) Support
 
-# CONFIG_IMX_SCMI_MISC_DRV is not set
-
 #
 # Qualcomm firmware drivers
 #
@@ -2067,6 +2071,7 @@ CONFIG_NVME_HWMON=y
 # CONFIG_DW_XDATA_PCIE is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_XILINX_SDFEC is not set
+CONFIG_NTSYNC=y
 # CONFIG_NSM is not set
 # CONFIG_C2PORT is not set
 
@@ -2075,18 +2080,12 @@ CONFIG_NVME_HWMON=y
 #
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
+CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_IDT_89HPESX is not set
 # CONFIG_EEPROM_EE1004 is not set
 # end of EEPROM support
 
 # CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# end of Texas Instruments shared transport line discipline
-
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
 CONFIG_INTEL_MEI=m
@@ -2117,7 +2116,6 @@ CONFIG_SCSI_COMMON=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_PROC_FS is not set
-# CONFIG_SCSI_LIB_KUNIT_TEST is not set
 
 #
 # SCSI support type (disk, tape, CD-ROM)
@@ -2131,7 +2129,6 @@ CONFIG_BLK_DEV_BSG=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-# CONFIG_SCSI_PROTO_TEST is not set
 
 #
 # SCSI Transports
@@ -2299,6 +2296,7 @@ CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_AUTODETECT=y
 # CONFIG_MD_BITMAP_FILE is not set
+# CONFIG_MD_LINEAR is not set
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
 CONFIG_MD_RAID10=y
@@ -2418,6 +2416,7 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_FUNGIBLE is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
+# CONFIG_NET_VENDOR_HISILICON is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
@@ -2536,6 +2535,7 @@ CONFIG_FIXED_PHY=m
 # CONFIG_QCA808X_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY_HWMON=y
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
 # CONFIG_SMSC_PHY is not set
@@ -2628,7 +2628,6 @@ CONFIG_USB_RTL8153_ECM=m
 
 # CONFIG_VMXNET3 is not set
 # CONFIG_FUJITSU_ES is not set
-# CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
 
@@ -2650,8 +2649,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_KUNIT_TEST is not set
 
 #
 # Input Device Drivers
@@ -2867,6 +2864,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_AMD756 is not set
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_AMD_MP2 is not set
+# CONFIG_I2C_AMD_ASF is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_ISCH is not set
 # CONFIG_I2C_ISMT is not set
@@ -3060,6 +3058,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_HS3001 is not set
 # CONFIG_SENSORS_I5500 is not set
 # CONFIG_SENSORS_CORETEMP is not set
+# CONFIG_SENSORS_ISL28022 is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWERZ is not set
@@ -3117,6 +3116,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_NCT6775_CORE=m
 CONFIG_SENSORS_NCT6775=m
 # CONFIG_SENSORS_NCT6775_I2C is not set
+# CONFIG_SENSORS_NCT7363 is not set
 # CONFIG_SENSORS_NCT7802 is not set
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
@@ -3188,10 +3188,8 @@ CONFIG_SENSORS_NCT6775=m
 # CONFIG_SENSORS_ASUS_EC is not set
 # CONFIG_SENSORS_HP_WMI is not set
 CONFIG_THERMAL=y
-# CONFIG_THERMAL_NETLINK is not set
+CONFIG_THERMAL_NETLINK=y
 # CONFIG_THERMAL_STATISTICS is not set
-# CONFIG_THERMAL_DEBUGFS is not set
-# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@@ -3202,6 +3200,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+# CONFIG_PCIE_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 
 #
@@ -3271,7 +3270,6 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_PC87413_WDT is not set
 # CONFIG_NV_TCO is not set
 # CONFIG_60XX_WDT is not set
-# CONFIG_CPU5_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_TQMX86_WDT is not set
@@ -3309,6 +3307,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_AXP20X_I2C is not set
+# CONFIG_MFD_CGBC is not set
 # CONFIG_MFD_CS42L43_I2C is not set
 # CONFIG_MFD_MADERA is not set
 # CONFIG_PMIC_DA903X is not set
@@ -3382,10 +3381,13 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_CS40L50_I2C is not set
+# CONFIG_MFD_UPBOARD_FPGA is not set
 # end of Multifunction device drivers
 
 # CONFIG_REGULATOR is not set
 # CONFIG_RC_CORE is not set
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
 
 #
 # CEC support
@@ -3585,6 +3587,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y
 #
 # Raspberry Pi media platform drivers
 #
+# CONFIG_VIDEO_RP1_CFE is not set
 
 #
 # Renesas media platform drivers
@@ -4050,19 +4053,32 @@ CONFIG_INTEL_GTT=m
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_KUNIT_TEST is not set
 CONFIG_DRM_KMS_HELPER=m
 # CONFIG_DRM_PANIC is not set
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM_CLIENT=y
+CONFIG_DRM_CLIENT_LIB=m
+CONFIG_DRM_CLIENT_SELECTION=m
+CONFIG_DRM_CLIENT_SETUP=y
+
+#
+# Supported DRM clients
+#
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+# CONFIG_DRM_CLIENT_LOG is not set
+CONFIG_DRM_CLIENT_DEFAULT_FBDEV=y
+CONFIG_DRM_CLIENT_DEFAULT="fbdev"
+# end of Supported DRM clients
+
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=m
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
+CONFIG_DRM_DISPLAY_DSC_HELPER=y
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
 CONFIG_DRM_TTM=m
@@ -4106,7 +4122,6 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 #
 CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_FP=y
-# CONFIG_DRM_AMD_SECURE_DISPLAY is not set
 # end of Display Engine Configuration
 
 CONFIG_HSA_AMD=y
@@ -4161,9 +4176,9 @@ CONFIG_DRM_XE_FORCE_PROBE=""
 # CONFIG_DRM_XE_WERROR is not set
 # CONFIG_DRM_XE_DEBUG is not set
 # CONFIG_DRM_XE_DEBUG_VM is not set
+# CONFIG_DRM_XE_DEBUG_MEMIRQ is not set
 # CONFIG_DRM_XE_DEBUG_SRIOV is not set
 # CONFIG_DRM_XE_DEBUG_MEM is not set
-# CONFIG_DRM_XE_KUNIT_TEST is not set
 # CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
 # CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
 # end of drm/Xe Debugging
@@ -4208,6 +4223,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # end of Display Interface Bridges
 
 # CONFIG_DRM_ETNAVIV is not set
+# CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
@@ -4215,6 +4231,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_VBOXVIDEO is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
+CONFIG_DRM_PANEL_BACKLIGHT_QUIRKS=m
 # CONFIG_DRM_WERROR is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
@@ -4332,7 +4349,6 @@ CONFIG_SND_PCM=m
 CONFIG_SND_HWDEP=m
 CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
-# CONFIG_SND_CORE_TEST is not set
 # CONFIG_SND_OSSEMUL is not set
 CONFIG_SND_PCM_TIMER=y
 CONFIG_SND_HRTIMER=m
@@ -4355,7 +4371,6 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_PCSP is not set
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_ALOOP is not set
-# CONFIG_SND_PCMTEST is not set
 # CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
@@ -4432,6 +4447,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_GT683R is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
+# CONFIG_HID_KYSONA is not set
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
@@ -4501,6 +4517,7 @@ CONFIG_STEAM_FF=y
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_UDRAW_PS3 is not set
 # CONFIG_HID_U2FZERO is not set
+# CONFIG_HID_UNIVERSAL_PIDFF is not set
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 # CONFIG_HID_WINWING is not set
@@ -4517,21 +4534,6 @@ CONFIG_HID_WIIMOTE=m
 #
 # end of HID-BPF support
 
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
 CONFIG_I2C_HID=y
 # CONFIG_I2C_HID_ACPI is not set
 # CONFIG_I2C_HID_OF is not set
@@ -4548,6 +4550,27 @@ CONFIG_I2C_HID=y
 CONFIG_AMD_SFH_HID=m
 # end of AMD SFH HID Support
 
+#
+# Intel THC HID Support
+#
+# CONFIG_INTEL_THC_HID is not set
+# end of Intel THC HID Support
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
@@ -4607,11 +4630,7 @@ CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_TMC is not set
 
 #
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; see USB_STORAGE Help for more info
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -4794,7 +4813,6 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
-# CONFIG_RTC_LIB_KUNIT_TEST is not set
 CONFIG_RTC_NVMEM=y
 
 #
@@ -4897,8 +4915,8 @@ CONFIG_DMA_ACPI=y
 # CONFIG_PLX_DMA is not set
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_XDMA is not set
-# CONFIG_AMD_QDMA is not set
 # CONFIG_AMD_PTDMA is not set
+# CONFIG_AMD_QDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 CONFIG_DW_DMAC_CORE=y
@@ -4919,7 +4937,6 @@ CONFIG_HSU_DMA=y
 # DMABUF options
 #
 CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
 CONFIG_UDMABUF=y
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_DEBUG is not set
@@ -4936,7 +4953,6 @@ CONFIG_VFIO_CONTAINER=y
 CONFIG_VFIO_IOMMU_TYPE1=m
 # CONFIG_VFIO_NOIOMMU is not set
 CONFIG_VFIO_VIRQFD=y
-# CONFIG_VFIO_DEBUGFS is not set
 
 #
 # VFIO support for PCI devices
@@ -4949,7 +4965,7 @@ CONFIG_VFIO_PCI_VGA=y
 # CONFIG_VFIO_PCI_IGD is not set
 # end of VFIO support for PCI devices
 
-CONFIG_IRQ_BYPASS_MANAGER=y
+CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VMGENID=y
 # CONFIG_VBOXGUEST is not set
@@ -4985,7 +5001,6 @@ CONFIG_VHOST_VSOCK=m
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
@@ -4999,8 +5014,16 @@ CONFIG_ACPI_WMI=m
 # CONFIG_ACERHDF is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACER_WMI is not set
+
+#
+# AMD HSMP Driver
+#
+# CONFIG_AMD_HSMP_ACPI is not set
+# CONFIG_AMD_HSMP_PLAT is not set
+# end of AMD HSMP Driver
+
 # CONFIG_AMD_PMC is not set
-# CONFIG_AMD_HSMP is not set
+# CONFIG_AMD_3D_VCACHE is not set
 # CONFIG_AMD_WBRF is not set
 # CONFIG_ADV_SWBUTTON is not set
 # CONFIG_APPLE_GMUX is not set
@@ -5077,10 +5100,6 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 # CONFIG_XILINX_VCU is not set
-# CONFIG_CLK_KUNIT_TEST is not set
-# CONFIG_CLK_FIXED_RATE_KUNIT_TEST is not set
-# CONFIG_CLK_GATE_KUNIT_TEST is not set
-# CONFIG_CLK_FD_KUNIT_TEST is not set
 # CONFIG_HWSPINLOCK is not set
 
 #
@@ -5105,7 +5124,6 @@ CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOMMU_IO_PGTABLE=y
 # end of Generic IOMMU Pagetable Support
 
-# CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
@@ -5114,6 +5132,7 @@ CONFIG_IOMMU_SVA=y
 CONFIG_IOMMU_IOPF=y
 CONFIG_AMD_IOMMU=y
 # CONFIG_INTEL_IOMMU is not set
+CONFIG_IOMMUFD_DRIVER_CORE=y
 CONFIG_IOMMUFD=y
 CONFIG_IRQ_REMAP=y
 # CONFIG_VIRTIO_IOMMU is not set
@@ -5131,8 +5150,6 @@ CONFIG_IRQ_REMAP=y
 # CONFIG_RPMSG_VIRTIO is not set
 # end of Rpmsg drivers
 
-# CONFIG_SOUNDWIRE is not set
-
 #
 # SOC (System On Chip) specific Drivers
 #
@@ -5217,7 +5234,6 @@ CONFIG_IRQ_REMAP=y
 #
 # IRQ chip support
 #
-# CONFIG_LAN966X_OIC is not set
 # end of IRQ chip support
 
 # CONFIG_IPACK_BUS is not set
@@ -5312,11 +5328,9 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
-# CONFIG_EXT4_KUNIT_TESTS is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
@@ -5348,6 +5362,7 @@ CONFIG_FUSE_FS=m
 # CONFIG_CUSE is not set
 CONFIG_VIRTIO_FS=m
 CONFIG_FUSE_PASSTHROUGH=y
+CONFIG_FUSE_IO_URING=y
 CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -5362,7 +5377,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
 # CONFIG_NETFS_DEBUG is not set
-# CONFIG_FSCACHE is not set
+CONFIG_FSCACHE=y
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_CACHEFILES is not set
 # end of Caches
 
 #
@@ -5383,7 +5400,6 @@ CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_FAT_KUNIT_TEST is not set
 CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_NTFS3_FS=m
@@ -5467,16 +5483,18 @@ CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
 CONFIG_NFS_V4_1=y
-# CONFIG_NFS_V4_2 is not set
+CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
-# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+CONFIG_NFS_V4_2_READ_PLUS=y
 CONFIG_NFSD=m
 # CONFIG_NFSD_V2 is not set
 CONFIG_NFSD_V3_ACL=y
@@ -5485,19 +5503,21 @@ CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_BLOCKLAYOUT=y
 # CONFIG_NFSD_SCSILAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
+# CONFIG_NFSD_V4_2_INTER_SSC is not set
 # CONFIG_NFSD_V4_SECURITY_LABEL is not set
 # CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
+# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 # CONFIG_NFS_LOCALIO is not set
+CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST is not set
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -5511,6 +5531,7 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SWN_UPCALL is not set
+# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_COMPRESSION is not set
 # CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=m
@@ -5587,6 +5608,7 @@ CONFIG_PROC_MEM_ALWAYS_FORCE=y
 # CONFIG_PROC_MEM_FORCE_PTRACE is not set
 # CONFIG_PROC_MEM_NO_FORCE is not set
 CONFIG_SECURITY=y
+CONFIG_HAS_SECURITY_AUDIT=y
 # CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
@@ -5733,7 +5755,6 @@ CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=m
@@ -5770,7 +5791,6 @@ CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=y
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_STREEBOG is not set
-# CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 CONFIG_CRYPTO_XXHASH=y
@@ -5859,8 +5879,6 @@ CONFIG_CRYPTO_SHA256_SSSE3=m
 # CONFIG_CRYPTO_SHA512_SSSE3 is not set
 # CONFIG_CRYPTO_SM3_AVX_X86_64 is not set
 # CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
 # end of Accelerated Cryptographic Algorithms for CPU (x86)
 
 CONFIG_CRYPTO_HW=y
@@ -5947,19 +5965,18 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
+CONFIG_ARCH_HAS_CRC_T10DIF=y
 # CONFIG_CRC64_ROCKSOFT is not set
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
+CONFIG_ARCH_HAS_CRC32=y
+CONFIG_CRC32_ARCH=y
 # CONFIG_CRC64 is not set
 # CONFIG_CRC4 is not set
 # CONFIG_CRC7 is not set
 CONFIG_LIBCRC32C=y
 # CONFIG_CRC8 is not set
+CONFIG_CRC_OPTIMIZATIONS=y
 CONFIG_XXHASH=y
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
@@ -6005,7 +6022,6 @@ CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
 CONFIG_DMA_NEED_SYNC=y
 # CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@@ -6034,13 +6050,12 @@ CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y
 CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_COPY_MC=y
 CONFIG_ARCH_STACKWALK=y
-CONFIG_STACKDEPOT=y
-CONFIG_STACKDEPOT_MAX_FRAMES=64
 CONFIG_SBITMAP=y
 # CONFIG_LWQ_TEST is not set
 # end of Library routines
 
 CONFIG_FIRMWARE_TABLE=y
+CONFIG_UNION_FIND=y
 
 #
 # Kernel hacking
@@ -6103,10 +6118,7 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
-# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
-# CONFIG_DEBUG_FS_ALLOW_NONE is not set
+# CONFIG_DEBUG_FS is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN=y
@@ -6122,6 +6134,7 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 # CONFIG_NET_DEV_REFCNT_TRACKER is not set
 # CONFIG_NET_NS_REFCNT_TRACKER is not set
 # CONFIG_DEBUG_NET is not set
+# CONFIG_DEBUG_NET_SMALL_RTNL is not set
 # end of Networking Debugging
 
 #
@@ -6129,8 +6142,7 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_DEBUG is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
@@ -6139,12 +6151,10 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
 CONFIG_GENERIC_PTDUMP=y
-# CONFIG_PTDUMP_DEBUGFS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_PER_VMA_LOCK_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SHRINKER_DEBUG is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_SCHED_STACK_END_CHECK is not set
 CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
@@ -6189,7 +6199,6 @@ CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 #
 # Scheduler Debugging
 #
-CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_INFO=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
@@ -6241,7 +6250,7 @@ CONFIG_STACKTRACE=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20
 # CONFIG_RCU_CPU_STALL_CPUTIME is not set
-CONFIG_RCU_TRACE=y
+# CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # end of RCU Debugging
 
@@ -6258,6 +6267,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_NO_PATCHABLE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -6320,9 +6330,7 @@ CONFIG_STRICT_DEVMEM=y
 # x86 Debugging
 #
 CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_EARLY_PRINTK is not set
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_DEBUG_TLBFLUSH is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -6331,25 +6339,20 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
-CONFIG_X86_DEBUG_FPU=y
+# CONFIG_X86_DEBUG_FPU is not set
 # CONFIG_PUNIT_ATOM_DEBUG is not set
 CONFIG_UNWINDER_ORC=y
 # CONFIG_UNWINDER_FRAME_POINTER is not set
+# CONFIG_UNWINDER_GUESS is not set
 # end of x86 Debugging
 
 #
 # Kernel Testing and Coverage
 #
-CONFIG_KUNIT=m
-# CONFIG_KUNIT_DEBUGFS is not set
-# CONFIG_KUNIT_TEST is not set
-# CONFIG_KUNIT_EXAMPLE_TEST is not set
-# CONFIG_KUNIT_ALL_TESTS is not set
-CONFIG_KUNIT_DEFAULT_ENABLED=y
+# CONFIG_KUNIT is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FUNCTION_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
@@ -6367,8 +6370,6 @@ CONFIG_ARCH_USE_MEMTEST=y
 # end of Rust hacking
 # end of Kernel hacking
 
-# CONFIG_INT_POW_TEST is not set
-
 #
 # Gentoo Linux
 #
diff --git a/hosts/iroha/scripts/amdgpu-clocks b/hosts/iroha/scripts/amdgpu-clocks
deleted file mode 100755
index 275f90d..0000000
--- a/hosts/iroha/scripts/amdgpu-clocks
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/usr/bin/env bash
-
-USER_STATES_PATH=${USER_STATES_PATH:-/etc/default/amdgpu-custom-state}
-SYS_PPFMASK=/sys/module/amdgpu/parameters/ppfeaturemask
-[ ! -r ${SYS_PPFMASK} ] && echo "Can't access ${SYS_PPFMASK}" && exit 2
-
-if [ "$1" == "restore" ]; then
-  RESTORE=true
-fi
-
-function check_ppfeaturemask() {
-  CURRENT_HEX_MASK=$(printf '%#x' "$(( $(cat ${SYS_PPFMASK}) ))")
-  # 0x4000 or 14th bit is one indicating if OverDrive has been enabled
-  OVERDRIVE_MASK=$(printf '%#x' "$(( CURRENT_HEX_MASK & 0x4000 ))")
-  [ "${OVERDRIVE_MASK}" == "0x4000" ] && return 0
-  WANTED_MASK=$(printf '%#x' "$(( CURRENT_HEX_MASK | 0x4000 ))")
-  echo -n "In order to set custom amdgpu power states, enable OverDrive by "
-  echo -n "booting the machine with amdgpu.ppfeaturemask=${WANTED_MASK} "
-  echo    "kernel option" && exit 2
-}
-
-function fill_sclks() {
-  if [ -z "${3}" ]; then     # Vega20 and later ASICs
-    echo "  SCLK state ${1}: ${2}"
-    SCLK[${1}]="s ${1} ${2%*M[Hh]z}"
-  else                       # Vega10 and previous ASICs
-    echo "  SCLK state ${1}: ${2}, ${3}"
-    SCLK[${1}]="s ${1} ${2%*M[Hh]z} ${3%*mV}"
-  fi
-}
-
-function fill_mclks() {
-  if [ -z "${3}" ]; then     # Vega20 and later ASICs
-    echo "  MCLK state ${1}: ${2}"
-    MCLK[${1}]="m ${1} ${2%*M[Hh]z}"
-  else                       # Vega10 and previous ASICs
-    echo "  MCLK state ${1}: ${2}, ${3}"
-    MCLK[${1}]="m ${1} ${2%*M[Hh]z} ${3%*mV}"
-  fi
-}
-
-function fill_vddccurve() {
-  if [ $# -eq 3 ]; then
-    echo "  VDDC Curve state $1: ${2} ${3}"
-    VDDC_CURVE[${1}]="vc ${1} ${2%*M[Hh]z} ${3%*mV}"
-  elif [ $# -eq 4 ]; then
-    echo "  VDDC Curve state $1: ${2} @ ${4}"
-    VDDC_CURVE[${1}]="vc ${1} ${2%*M[Hh]z} ${4%*mV}"
-  else
-    echo "ERROR: Can't parse '$*', did pp_od_clk_voltage API change again?"
-    exit 2
-  fi
-}
-
-function fill_vddgfx_offset() {
-  echo "  VDD GFX Offset: $1"
-  VDDGFX_OFFSET="vo ${1%*mV}"
-}
-
-function parse_states() {
-  mapfile -t STATE_LINES < <(tr -d '\000' < "$1")
-  for LNNO in "${!STATE_LINES[@]}"; do
-    LINE="${STATE_LINES[$LNNO]}"
-    case ${LINE} in
-      "OD_SCLK:")
-        state_fill_func=fill_sclks ;;
-      "OD_MCLK:")
-        state_fill_func=fill_mclks ;;
-      "OD_VDDC_CURVE:")
-        state_fill_func=fill_vddccurve ;;
-      "VDDC_CURVE_SCLK["[012]"]: "*)
-        ;; # Just ignoring these for now
-      "VDDC_CURVE_VOLT["[012]"]: "*)
-        ;; # Just ignoring these for now
-      "OD_VDDGFX_OFFSET:")
-        offset_fill_func=fill_vddgfx_offset ;;
-      "OD_RANGE:")
-        echo "  Maximum clocks & voltages:";;
-      "SCLK: "*)
-        echo "    SCLK clock ${LINE##* }"
-        MAX_SCLK=${LINE##* }
-        MAX_SCLK=${MAX_SCLK%*M[Hh]z}
-        ;;
-      "MCLK: "*)
-        echo "    MCLK clock ${LINE##* }"
-        MAX_MCLK=${LINE##* }
-        MAX_MCLK=${MAX_MCLK%*M[Hh]z}
-        ;;
-      "VDDGFX_OFFSET: "*)
-        echo "    VDDGFX offset range: ${LINE#*: }"
-        OFFSET_RANGE=${LINE#*: }
-        ;;
-      "VDDC: "*)
-        echo "    VDDC voltage ${LINE##* }"
-        MAX_VDDC=${LINE##* }
-        MAX_VDDC=${MAX_VDDC%*mV}
-        ;;
-      [0-9]": "*)
-        $state_fill_func ${LINE%%:*} ${LINE#* }
-        ;;
-      [-0-9]*"mV")
-        $offset_fill_func ${LINE%%:*} ${LINE#* }
-        ;;
-      "FORCE_SCLK: "[0-9]*)
-        echo "  Force SCLK state to ${LINE#* }"
-        FORCE_SCLK=${LINE#* }
-        ;;
-      "FORCE_MCLK: "[0-9]*)
-        echo "  Force MCLK state to ${LINE#* }"
-        FORCE_MCLK=${LINE#* }
-        ;;
-      "FORCE_POWER_CAP: "[0-9]*)
-        MICROWATTS=${LINE#* }
-        echo "  Force power cap to ${MICROWATTS%*000000}W"
-        FORCE_POWER_CAP=${LINE#* }
-        ;;
-      "FORCE_PERF_LEVEL: "[a-z]*)
-        echo "  Force performance level to ${LINE#* }"
-        FORCE_LEVEL=${LINE#* }
-        ;;
-      "FORCE_POWER_PROFILE: "[0-9]*)
-        echo "  Force power profile to ${LINE#* }"
-        FORCE_PROFILE=${LINE#* }
-        ;;
-      "#"*) ;;
-      "") ;;
-      *)
-        echo "  Unexpected value in ${1}:$((LNNO + 1))"
-        exit 2
-        ;;
-    esac
-  done
-  if [ "$1" == "${SYS_PP_OD_CLK}" ]; then
-    DETECTED_MCLK=("${MCLK[@]}")
-    DETECTED_VDDC_CURVE=("${VDDC_CURVE[@]}")
-    POWER_LIMIT=$(cat "$PWR_CAP_FILE")
-    echo "  Curent power cap: ${POWER_LIMIT%*000000}W"
-  fi
-}
-
-function set_custom_states() {
-  if [ "${RESTORE}" == "true" ] && [ "${FORCE_LEVEL}" == "auto" ]; then
-    echo manual > "${PWR_LEVEL}"
-    sleep 0.25
-    echo 0 > "${SYS_DPM_SCLK}" 2>&1
-    echo 0 > "${SYS_DPM_MCLK}" 2>&1
-    sleep 0.25
-  fi
-  for CSTATE in "${SCLK[@]}"; do
-    echo "${CSTATE}" > "${SYS_PP_OD_CLK}"
-  done
-  for MSTATE in "${MCLK[@]}"; do
-    OLD_MSTATE=${DETECTED_MCLK[$((${MSTATE:3:1}))]}
-    if [ "${MSTATE}" != "${OLD_MSTATE}" ]; then
-      echo "${MSTATE}" > "${SYS_PP_OD_CLK}" ||
-        echo "ERROR: echo ${MSTATE} > ${SYS_PP_OD_CLK}"
-    fi
-  done
-  for VDDC_CURVE_STATE in "${VDDC_CURVE[@]}"; do
-    OLD_CURVE_STATE=${DETECTED_VDDC_CURVE[$((${VDDC_CURVE_STATE:3:1}))]}
-    if [ "${VDDC_CURVE_STATE}" != "${OLD_CURVE_STATE}" ]; then
-      echo "${VDDC_CURVE_STATE}" > "${SYS_PP_OD_CLK}" ||
-        echo "ERROR: echo ${VDDC_CURVE_STATE} > ${SYS_PP_OD_CLK}"
-    fi
-  done
-  if [ "${VDDGFX_OFFSET}" ]; then
-    echo "${VDDGFX_OFFSET}" > "${SYS_PP_OD_CLK}"
-  fi
-  echo 'c' > "${SYS_PP_OD_CLK}"
-  if [ "${FORCE_LEVEL}" ]; then
-    echo ${FORCE_LEVEL} > ${PWR_LEVEL}
-  fi
-  if [ "${FORCE_PROFILE}" ]; then
-    echo ${FORCE_PROFILE} > ${PWR_PROFILE}
-  fi
-  if [ "${FORCE_SCLK}" ]; then
-    echo "${FORCE_SCLK}" > "${SYS_DPM_SCLK}"
-  fi
-  if [ "${FORCE_MCLK}" ]; then
-    echo "${FORCE_MCLK}" > "${SYS_DPM_MCLK}"
-  fi
-  if [ "${FORCE_POWER_CAP}" ]; then
-    echo "${FORCE_POWER_CAP}" > "${PWR_CAP_FILE}"
-  fi
-}
-
-function backup_states() {
-  if [ ! -r "${BACKUP_STATE_FILE}" ]; then
-    cp "${SYS_PP_OD_CLK}" "${BACKUP_STATE_FILE}"
-    if [ "${PWR_LEVEL}" == "manual" ]; then
-      echo "FORCE_POWER_PROFILE: 0" >> "${BACKUP_STATE_FILE}"
-    fi
-    echo "FORCE_PERF_LEVEL: $(cat "${PWR_LEVEL}")" >> "${BACKUP_STATE_FILE}"
-    echo "FORCE_POWER_CAP: $(cat "${PWR_CAP_FILE}")" >> "${BACKUP_STATE_FILE}"
-    echo "Writen initial backup states to ${BACKUP_STATE_FILE}"
-  else
-    echo "Won't write initial state to ${BACKUP_STATE_FILE}, it already exists."
-  fi
-}
-
-function restore_states() {
-  if [ -f "${BACKUP_STATE_FILE}" ]; then
-    echo "Restoring all states to the initial defaults from ${BACKUP_STATE_FILE}"
-    USER_STATE_FILE=${BACKUP_STATE_FILE}
-  else
-    echo "Cant't access initial defaults at ${BACKUP_STATE_FILE}, aborting."
-    exit 2
-  fi
-}
-
-function clear_vars() {
-    unset SCLK MCLK
-    unset VDDC_CURVE VDDGFX_OFFSET
-    unset sys_device sys_hwmons
-}
-
-check_ppfeaturemask
-
-shopt -s extglob
-for USER_STATE_FILE in ${USER_STATES_PATH}*.+(card?|card??|pci:????:??:??.?); do
-  BACKUP_STATE_FILE=/tmp/${USER_STATE_FILE##*/}.initial
-  if [[ "${USER_STATE_FILE}" == *"pci"* ]]; then
-    STATE_PCIDEV=${USER_STATE_FILE#*.}
-    for CARD in /sys/class/drm/card{?,??}; do
-      LINK=$(readlink $CARD)
-      if [ "${LINK}" ]; then
-        CARD_PCDEV=${LINK%*/drm/card*}
-        if [[ "${CARD_PCDEV##*/}" == "${STATE_PCIDEV#*:}" ]]; then
-          sys_device="${CARD}"/device
-        fi
-      fi
-    done
-  else
-    sys_device=/sys/class/drm/${USER_STATE_FILE##*.}/device
-  fi
-  sys_hwmons=( "${sys_device}"/hwmon/hwmon[0-9] )
-
-  SYS_PP_OD_CLK=${sys_device}/pp_od_clk_voltage
-  PWR_LEVEL=${sys_device}/power_dpm_force_performance_level
-  PWR_PROFILE=${sys_device}/pp_power_profile_mode
-  SYS_DPM_SCLK=${sys_device}/pp_dpm_sclk
-  SYS_DPM_MCLK=${sys_device}/pp_dpm_mclk
-  PWR_CAP_FILE=${sys_hwmons[0]}/power1_cap
-
-  if [ -f "${SYS_PP_OD_CLK}" ]; then
-    if [ "${RESTORE}" == "true" ]; then
-      restore_states
-    else
-      backup_states
-    fi
-    echo "Detecting the state values at ${SYS_PP_OD_CLK}:"
-    parse_states "${SYS_PP_OD_CLK}"
-    echo "Verifying user state values at ${USER_STATE_FILE}:"
-    parse_states "${USER_STATE_FILE}"
-    echo "Committing custom states to ${SYS_PP_OD_CLK}:"
-    set_custom_states
-    echo "  Done"
-    clear_vars
-  else
-    echo "WARNING: ${SYS_PP_OD_CLK} does not exist, skipping!"
-  fi
-done
diff --git a/hosts/iroha/scripts/export-nfs b/hosts/iroha/scripts/export-nfs
new file mode 100755
index 0000000..3643fa3
--- /dev/null
+++ b/hosts/iroha/scripts/export-nfs
@@ -0,0 +1,2 @@
+#! /usr/bin/env sh
+sudo exportfs -o rw,async,insecure,no_subtree_check,crossmnt -i 192.168.0.0/16:$1
diff --git a/hosts/iroha/scripts/game b/hosts/iroha/scripts/game
new file mode 100755
index 0000000..c716f7e
--- /dev/null
+++ b/hosts/iroha/scripts/game
@@ -0,0 +1,6 @@
+#! /usr/bin/env sh
+sudo su -c 'echo high > /sys/class/drm/card0/device/power_dpm_force_performance_level'
+#read -p "Waiting..."
+sudo scx_bpfland
+sudo su -c 'echo auto > /sys/class/drm/card0/device/power_dpm_force_performance_level'
+
diff --git a/hosts/iroha/scripts/gen-dracut b/hosts/iroha/scripts/gen-dracut
index 9b9501a..22a4b3c 100755
--- a/hosts/iroha/scripts/gen-dracut
+++ b/hosts/iroha/scripts/gen-dracut
@@ -1,2 +1,2 @@
 #! /usr/bin/env sh
-dracut -a lvm --kver=6.12.9-gentoo --force
+dracut -a lvm --kver=6.14.4-gentoo --force
diff --git a/hosts/iroha/scripts/port-forward b/hosts/iroha/scripts/port-forward
index 59eca03..3318141 100755
--- a/hosts/iroha/scripts/port-forward
+++ b/hosts/iroha/scripts/port-forward
@@ -6,24 +6,27 @@ if [ "$(id -u)" -ne 0 ]; then
 fi
 
 # Sunshine
-iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.252:47984 || \
-  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.252:47984
-
-iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.252:47984 || \
-  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.252:47984
-
-iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 47989 -j DNAT --to-destination 192.168.211.252:47989 || \
-  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 47989 -j DNAT --to-destination 192.168.211.252:47989
-
-iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 48010 -j DNAT --to-destination 192.168.211.252:48010 || \
-  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 48010 -j DNAT --to-destination 192.168.211.252:48010
-
-iptables -t nat -C PREROUTING -p udp -i enp7s0 --dport 47998:48000 -j DNAT --to-destination 192.168.211.252:47998-48000 || \
-  iptables -t nat -A PREROUTING -p udp -i enp7s0 --dport 47998:48000 -j DNAT --to-destination 192.168.211.252:47998-48000
+#iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.251:47984 || \
+#  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.251:47984
+#
+#iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.251:47984 || \
+#  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 47984 -j DNAT --to-destination 192.168.211.251:47984
+#
+#iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 47989 -j DNAT --to-destination 192.168.211.251:47989 || \
+#  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 47989 -j DNAT --to-destination 192.168.211.251:47989
+#
+#iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 48010 -j DNAT --to-destination 192.168.211.251:48010 || \
+#  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 48010 -j DNAT --to-destination 192.168.211.251:48010
+#
+#iptables -t nat -C PREROUTING -p udp -i enp7s0 --dport 47998:48000 -j DNAT --to-destination 192.168.211.251:47998-48000 || \
+#  iptables -t nat -A PREROUTING -p udp -i enp7s0 --dport 47998:48000 -j DNAT --to-destination 192.168.211.251:47998-48000
 
 # KDEConnect
-iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.252:1714-1764 || \
-  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.252:1714-1764
+iptables -t nat -C PREROUTING -p tcp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.251:1714-1764 || \
+  iptables -t nat -A PREROUTING -p tcp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.251:1714-1764
+
+iptables -t nat -C PREROUTING -p udp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.251:1714-1764 || \
+  iptables -t nat -A PREROUTING -p udp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.251:1714-1764
 
-iptables -t nat -C PREROUTING -p udp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.252:1714-1764 || \
-  iptables -t nat -A PREROUTING -p udp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.252:1714-1764
+#iptables -t nat -D PREROUTING -p tcp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.251:1714-1764
+#iptables -t nat -D PREROUTING -p udp -i enp7s0 --dport 1714:1764 -j DNAT --to-destination 192.168.211.251:1714-1764
diff --git a/hosts/iroha/scripts/prepare-gpu b/hosts/iroha/scripts/prepare-gpu
index f265432..eaf93cf 100755
--- a/hosts/iroha/scripts/prepare-gpu
+++ b/hosts/iroha/scripts/prepare-gpu
@@ -1,3 +1,3 @@
 #! /usr/bin/env sh
-sudo $HOME/scripts/amdgpu-clocks
-#echo "1" | sudo tee /sys/class/drm/card0/device/pp_power_profile_mode
+# https://github.com/sibradzic/amdgpu-clocks/blob/504785df769e1d128d16a6f1545d2f425d70a310/amdgpu-clocks
+sudo $HOME/run/amdgpu-clocks
diff --git a/hosts/iroha/scripts/prepare-mounts b/hosts/iroha/scripts/prepare-mounts
index 0c7ceb4..b033d68 100755
--- a/hosts/iroha/scripts/prepare-mounts
+++ b/hosts/iroha/scripts/prepare-mounts
@@ -3,3 +3,5 @@
 sudo kpartx -a /dev/iroha-vg1/iroha-store0-raid1
 sudo cryptsetup open /dev/mapper/iroha--vg1-iroha--store0--raid1p1 store
 sudo mount /dev/mapper/store /mnt/store
+
+sudo mount /dev/iroha-vg1/iroha-store1-raid1 /mnt/data
diff --git a/hosts/iroha/scripts/prepare-network-mounts b/hosts/iroha/scripts/prepare-network-mounts
index ea60cd4..7559c26 100755
--- a/hosts/iroha/scripts/prepare-network-mounts
+++ b/hosts/iroha/scripts/prepare-network-mounts
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
 
-$HOME/scripts/mount-nfs /srv/nfs/c /home/andrew/c
-$HOME/scripts/mount-nfs /srv/nfs/pics /home/andrew/pics
-$HOME/scripts/mount-nfs /srv/nfs/torrents /mnt/store/files/ext/torrents
+/home/andrew/scripts/mount-nfs /srv/nfs/c /home/andrew/c
+/home/andrew/scripts/mount-nfs /srv/nfs/pics /home/andrew/pics
+/home/andrew/scripts/mount-nfs /srv/nfs/torrents /mnt/store/files/ext/torrents
diff --git a/hosts/iroha/scripts/run-pipewire b/hosts/iroha/scripts/run-pipewire
new file mode 100755
index 0000000..ef6a987
--- /dev/null
+++ b/hosts/iroha/scripts/run-pipewire
@@ -0,0 +1,5 @@
+#! /usr/bin/env sh
+sudo mkdir -p /run/user/1000         
+sudo chown andrew:users /run/user/1000
+export XDG_RUNTIME_DIR=/run/user/1000
+gentoo-pipewire-launcher restart &
diff --git a/hosts/iroha/scripts/thumb_drive_setup.txt b/hosts/iroha/scripts/thumb_drive_setup.txt
new file mode 100644
index 0000000..f52a5d0
--- /dev/null
+++ b/hosts/iroha/scripts/thumb_drive_setup.txt
@@ -0,0 +1,5 @@
+sudo cryptsetup luksFormat --key-size 512 /dev/sdd1
+sudo cryptsetup luksHeaderBackup /dev/sdd1 --header-backup-file crypt_headers/thumb_drive2.img
+sudo cryptsetup luksOpen /dev/sdd1 thumb_drive2
+sudo mkfs.ext4 /dev/mapper/thumb_drive2
+sudo mount /dev/mapper/thumb_drive2 /mnt/tmp
diff --git a/hosts/moyo/container.nix b/hosts/moyo/container.nix
index f596d87..d00e460 100644
--- a/hosts/moyo/container.nix
+++ b/hosts/moyo/container.nix
@@ -1,11 +1,23 @@
 { config, lib, pkgs, modulesPath, ... }: {
   imports = [
     "${modulesPath}/virtualisation/lxc-container.nix"
-    ../../nix/system.nix
   ];
 
   boot.isContainer = true;
 
+  nix = {
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+      auto-optimise-store = true;
+      download-buffer-size = 134217728;
+    };
+    gc.automatic = false;
+    optimise.automatic = true;
+  };
+
+  nixpkgs.config.allowUnfree = true;
+  hardware.enableRedistributableFirmware = true;
+
   users.users.andrew = {
     isNormalUser = true;
     uid = 1000;
@@ -20,6 +32,9 @@
     system = "x86_64-linux";
   };
 
+  time.timeZone = "America/New_York";
+  i18n.defaultLocale = "en_US.UTF-8";
+
   networking = {
     hostName = "the-p";
     useDHCP = false;
@@ -47,9 +62,16 @@
 
   users.defaultUserShell = pkgs.bashInteractive;
 
+  programs.screen = {
+    enable = true;
+    screenrc = ''
+      termcapinfo xterm* ti@:te@
+    '';
+  };
+
   environment.systemPackages = with pkgs; [
+    git # flakes
     kitty.terminfo
-    screen
     htop
     ((vim-full.override {
       features = "small";
diff --git a/hosts/moyo/gentoo/make.conf b/hosts/moyo/gentoo/make.conf
index 22b2cde..9ee18b9 100644
--- a/hosts/moyo/gentoo/make.conf
+++ b/hosts/moyo/gentoo/make.conf
@@ -18,8 +18,8 @@ EMERGE_DEFAULT_OPTS="--jobs 2"
 
 RUBY_TARGETS="ruby32"
 
-LUA_SINGLE_TARGET="luajit"
-LUA_TARGETS="luajit"
+LUA_SINGLE_TARGET="lua5-4"
+LUA_TARGETS="lua5-4"
 
 KERNEL="linux"
 
diff --git a/hosts/moyo/gentoo/package.accept_keywords/cowsql b/hosts/moyo/gentoo/package.accept_keywords/cowsql
new file mode 100644
index 0000000..744c16e
--- /dev/null
+++ b/hosts/moyo/gentoo/package.accept_keywords/cowsql
@@ -0,0 +1 @@
+dev-libs/cowsql ~amd64
diff --git a/hosts/moyo/gentoo/package.accept_keywords/samba b/hosts/moyo/gentoo/package.accept_keywords/samba
new file mode 100644
index 0000000..90d7b6d
--- /dev/null
+++ b/hosts/moyo/gentoo/package.accept_keywords/samba
@@ -0,0 +1 @@
+net-fs/samba ~amd64
diff --git a/hosts/moyo/gentoo/package.accept_keywords/talloc b/hosts/moyo/gentoo/package.accept_keywords/talloc
new file mode 100644
index 0000000..f08e38b
--- /dev/null
+++ b/hosts/moyo/gentoo/package.accept_keywords/talloc
@@ -0,0 +1 @@
+sys-libs/talloc ~amd64
diff --git a/hosts/moyo/gentoo/package.accept_keywords/tdb b/hosts/moyo/gentoo/package.accept_keywords/tdb
new file mode 100644
index 0000000..4b53952
--- /dev/null
+++ b/hosts/moyo/gentoo/package.accept_keywords/tdb
@@ -0,0 +1 @@
+sys-libs/tdb ~amd64
diff --git a/hosts/moyo/gentoo/package.accept_keywords/tevent b/hosts/moyo/gentoo/package.accept_keywords/tevent
new file mode 100644
index 0000000..924bdcc
--- /dev/null
+++ b/hosts/moyo/gentoo/package.accept_keywords/tevent
@@ -0,0 +1 @@
+sys-libs/tevent ~amd64
diff --git a/hosts/moyo/gentoo/package.use/binutils-libs b/hosts/moyo/gentoo/package.use/binutils-libs
new file mode 100644
index 0000000..d2d9d0d
--- /dev/null
+++ b/hosts/moyo/gentoo/package.use/binutils-libs
@@ -0,0 +1 @@
+sys-libs/binutils-libs -cet
diff --git a/hosts/moyo/kernel_config b/hosts/moyo/kernel_config
index ae04fe0..5350360 100644
--- a/hosts/moyo/kernel_config
+++ b/hosts/moyo/kernel_config
@@ -1,16 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.67-gentoo Kernel Configuration
+# Linux/x86 6.12.21-gentoo Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.2.1_p20241221 p7) 14.2.1 20241221"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=140201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24301
+CONFIG_AS_VERSION=24400
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24301
+CONFIG_LD_VERSION=24400
 CONFIG_LLD_VERSION=0
+CONFIG_RUSTC_VERSION=108401
+CONFIG_RUSTC_LLVM_VERSION=190105
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -19,7 +21,6 @@ CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
-CONFIG_HAVE_CTF_TOOLCHAIN=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -82,10 +83,10 @@ CONFIG_SPARSE_IRQ=y
 
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST_IDLE=y
 CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
@@ -120,7 +121,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem
 
@@ -160,6 +160,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
+CONFIG_NEED_TASKS_RCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
@@ -177,6 +178,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # Scheduler features
 #
 # CONFIG_UCLAMP_TASK is not set
+# CONFIG_SCHED_ALT is not set
 # end of Scheduler features
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
@@ -185,15 +187,19 @@ CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_GCC10_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
+CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_SLAB_OBJ_EXT=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+CONFIG_MEMCG_V1=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_CFS_BANDWIDTH is not set
 # CONFIG_RT_GROUP_SCHED is not set
@@ -203,6 +209,7 @@ CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+CONFIG_CPUSETS_V1=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -250,7 +257,6 @@ CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
 CONFIG_EPOLL=y
@@ -262,14 +268,13 @@ CONFIG_AIO=y
 CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_KCMP=y
-CONFIG_RSEQ=y
-CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_GUEST_PERF_EVENTS=y
 
@@ -284,10 +289,9 @@ CONFIG_PERF_EVENTS=y
 #
 # Kexec and crash features
 #
-CONFIG_CRASH_CORE=y
+CONFIG_VMCORE_INFO=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
-# CONFIG_CRASH_DUMP is not set
 # end of Kexec and crash features
 # end of General setup
 
@@ -324,9 +328,10 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 #
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
+# CONFIG_X86_POSTED_MSI is not set
 # CONFIG_X86_MPPARSE is not set
-# CONFIG_GOLDFISH is not set
 CONFIG_X86_CPU_RESCTRL=y
+# CONFIG_X86_FRED is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_X86_INTEL_LPSS is not set
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
@@ -360,9 +365,10 @@ CONFIG_MZEN=y
 # CONFIG_MZEN2 is not set
 # CONFIG_MZEN3 is not set
 # CONFIG_MZEN4 is not set
+# CONFIG_MZEN5 is not set
 # CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
+# CONFIG_MCORE2 is not set
 # CONFIG_MNEHALEM is not set
 # CONFIG_MWESTMERE is not set
 # CONFIG_MSILVERMONT is not set
@@ -375,7 +381,8 @@ CONFIG_MZEN=y
 # CONFIG_MSKYLAKE is not set
 # CONFIG_MSKYLAKEX is not set
 # CONFIG_MCANNONLAKE is not set
-# CONFIG_MICELAKE is not set
+# CONFIG_MICELAKE_CLIENT is not set
+# CONFIG_MICELAKE_SERVER is not set
 # CONFIG_MCASCADELAKE is not set
 # CONFIG_MCOOPERLAKE is not set
 # CONFIG_MTIGERLAKE is not set
@@ -386,15 +393,13 @@ CONFIG_MZEN=y
 # CONFIG_MMETEORLAKE is not set
 # CONFIG_MEMERALDRAPIDS is not set
 # CONFIG_GENERIC_CPU is not set
-# CONFIG_GENERIC_CPU2 is not set
-# CONFIG_GENERIC_CPU3 is not set
-# CONFIG_GENERIC_CPU4 is not set
 # CONFIG_MNATIVE_INTEL is not set
 # CONFIG_MNATIVE_AMD is not set
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
+CONFIG_X86_HAVE_PAE=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
@@ -420,6 +425,7 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_MC_PRIO=y
 CONFIG_X86_LOCAL_APIC=y
+CONFIG_ACPI_MADT_WAKEUP=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
@@ -466,11 +472,11 @@ CONFIG_MTRR_SANITIZER=y
 CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=0
 CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_X86_UMIP=y
 CONFIG_CC_HAS_IBT=y
 # CONFIG_X86_KERNEL_IBT is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_ARCH_PKEY_BITS=4
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
@@ -480,7 +486,6 @@ CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_HANDOVER_PROTOCOL is not set
 # CONFIG_EFI_MIXED is not set
-# CONFIG_EFI_FAKE_MEMMAP is not set
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
@@ -495,6 +500,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG_FORCE=y
 CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
 CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
@@ -515,6 +521,9 @@ CONFIG_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
 # end of Processor type and features
 
+CONFIG_CC_HAS_NAMED_AS=y
+CONFIG_CC_HAS_NAMED_AS_FIXED_SANITIZERS=y
+CONFIG_USE_X86_SEG_SUPPORT=y
 CONFIG_CC_HAS_SLS=y
 CONFIG_CC_HAS_RETURN_THUNK=y
 CONFIG_CC_HAS_ENTRY_PADDING=y
@@ -532,6 +541,8 @@ CONFIG_SUSPEND_FREEZER=y
 CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_HIBERNATION_SNAPSHOT_DEV=y
+CONFIG_HIBERNATION_COMP_LZO=y
+CONFIG_HIBERNATION_DEF_COMP="lzo"
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
@@ -548,6 +559,7 @@ CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+CONFIG_ACPI_THERMAL_LIB=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SPCR_TABLE=y
 # CONFIG_ACPI_FPDT is not set
@@ -617,7 +629,8 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 #
 CONFIG_X86_INTEL_PSTATE=y
 # CONFIG_X86_PCC_CPUFREQ is not set
-# CONFIG_X86_AMD_PSTATE is not set
+CONFIG_X86_AMD_PSTATE=y
+CONFIG_X86_AMD_PSTATE_DEFAULT_MODE=3
 # CONFIG_X86_AMD_PSTATE_UT is not set
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
@@ -658,44 +671,51 @@ CONFIG_AMD_NB=y
 # Binary Emulations
 #
 CONFIG_IA32_EMULATION=y
+# CONFIG_IA32_EMULATION_DEFAULT_DISABLED is not set
 # CONFIG_X86_X32_ABI is not set
 CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 # end of Binary Emulations
 
-CONFIG_HAVE_KVM=y
+CONFIG_KVM_COMMON=y
 CONFIG_HAVE_KVM_PFNCACHE=y
 CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
 CONFIG_HAVE_KVM_IRQ_ROUTING=y
 CONFIG_HAVE_KVM_DIRTY_RING=y
 CONFIG_HAVE_KVM_DIRTY_RING_TSO=y
 CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y
-CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_READONLY_MEM=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=y
 CONFIG_KVM_COMPAT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_KVM_XFER_TO_GUEST_WORK=y
 CONFIG_HAVE_KVM_PM_NOTIFIER=y
 CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
+CONFIG_KVM_GENERIC_MMU_NOTIFIER=y
 CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_X86=m
 CONFIG_KVM=m
 # CONFIG_KVM_INTEL is not set
 CONFIG_KVM_AMD=m
 CONFIG_KVM_SMM=y
+# CONFIG_KVM_HYPERV is not set
 # CONFIG_KVM_XEN is not set
+CONFIG_KVM_MAX_NR_VCPUS=1024
 CONFIG_AS_AVX512=y
 CONFIG_AS_SHA1_NI=y
 CONFIG_AS_SHA256_NI=y
 CONFIG_AS_TPAUSE=y
 CONFIG_AS_GFNI=y
+CONFIG_AS_VAES=y
+CONFIG_AS_VPCLMULQDQ=y
 CONFIG_AS_WRUSS=y
 CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
 
@@ -736,6 +756,7 @@ CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
+CONFIG_ARCH_HAS_CPU_PASID=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_ARCH_WANTS_NO_INSTR=y
@@ -758,6 +779,7 @@ CONFIG_MMU_GATHER_RCU_TABLE_FREE=y
 CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_ARCH_HAVE_EXTRA_ELF_NOTES=y
 CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
@@ -802,8 +824,11 @@ CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SHIFT=12
 CONFIG_HAVE_OBJTOOL=y
 CONFIG_HAVE_JUMP_LABEL_HACK=y
 CONFIG_HAVE_NOINSTR_HACK=y
@@ -814,6 +839,7 @@ CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_SUPPORTS_RT=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
@@ -837,7 +863,9 @@ CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAS_ELFCORE_COMPAT=y
 CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y
 CONFIG_DYNAMIC_SIGFRAME=y
+CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
 CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
+CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
 
 #
 # GCOV-based kernel profiling
@@ -851,10 +879,11 @@ CONFIG_GCC_PLUGINS=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT_16B=y
 CONFIG_FUNCTION_ALIGNMENT=16
+CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
+CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -863,12 +892,15 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
+CONFIG_MODULE_COMPRESS=y
+CONFIG_MODULE_COMPRESS_GZIP=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
 # CONFIG_MODULE_COMPRESS_ZSTD is not set
+CONFIG_MODULE_COMPRESS_ALL=y
+# CONFIG_MODULE_DECOMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@@ -876,9 +908,9 @@ CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_WBT is not set
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
@@ -961,17 +993,17 @@ CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
 
 #
-# SLAB allocator options
+# Slab allocator options
 #
-# CONFIG_SLAB_DEPRECATED is not set
 CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
-# end of SLAB allocator options
+# end of Slab allocator options
 
 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 # CONFIG_COMPAT_BRK is not set
@@ -981,7 +1013,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y
 CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y
-CONFIG_HAVE_FAST_GUP=y
+CONFIG_HAVE_GUP_FAST=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
@@ -992,8 +1024,9 @@ CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MHP_MEMMAP_ON_MEMORY=y
 CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_SPLIT_PMD_PTLOCKS=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
@@ -1013,6 +1046,7 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANTS_THP_SWAP=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -1032,6 +1066,7 @@ CONFIG_GET_FREE_REGION=y
 CONFIG_DEVICE_PRIVATE=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
+CONFIG_ARCH_USES_PG_ARCH_2=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_PERCPU_STATS is not set
 
@@ -1047,9 +1082,12 @@ CONFIG_SECRETMEM=y
 CONFIG_LRU_GEN=y
 CONFIG_LRU_GEN_ENABLED=y
 # CONFIG_LRU_GEN_STATS is not set
+CONFIG_LRU_GEN_WALKS_MMU=y
 CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y
+CONFIG_IOMMU_MM_DATA=y
+CONFIG_EXECMEM=y
 
 #
 # Data Access Monitoring
@@ -1063,6 +1101,7 @@ CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_XGRESS=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y
 
 #
 # Networking options
@@ -1070,7 +1109,6 @@ CONFIG_SKB_EXTENSIONS=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
 CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX_DIAG=m
 # CONFIG_TLS is not set
@@ -1142,6 +1180,8 @@ CONFIG_TCP_CONG_BBR=y
 CONFIG_DEFAULT_BBR=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="bbr"
+CONFIG_TCP_SIGPOOL=y
+# CONFIG_TCP_AO is not set
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
 # CONFIG_IPV6_ROUTER_PREF is not set
@@ -1267,6 +1307,7 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
 # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+# CONFIG_NETFILTER_XT_TARGET_CT is not set
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 CONFIG_NETFILTER_XT_TARGET_HL=m
 # CONFIG_NETFILTER_XT_TARGET_HMARK is not set
@@ -1278,11 +1319,13 @@ CONFIG_NETFILTER_XT_NAT=m
 CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
@@ -1392,6 +1435,7 @@ CONFIG_IP_VS_NFCT=y
 # IP: Netfilter Configuration
 #
 CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
 # CONFIG_NF_SOCKET_IPV4 is not set
 # CONFIG_NF_TPROXY_IPV4 is not set
 CONFIG_NF_TABLES_IPV4=y
@@ -1418,14 +1462,15 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_ECN is not set
 # CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_RAW is not set
+CONFIG_IP_NF_RAW=m
 # CONFIG_IP_NF_SECURITY is not set
-# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_ARPFILTER is not set
 # end of IP: Netfilter Configuration
 
 #
 # IPv6: Netfilter Configuration
 #
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
 # CONFIG_NF_SOCKET_IPV6 is not set
 # CONFIG_NF_TPROXY_IPV6 is not set
 CONFIG_NF_TABLES_IPV6=y
@@ -1451,7 +1496,7 @@ CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_IP6_NF_TARGET_SYNPROXY is not set
 CONFIG_IP6_NF_MANGLE=m
-# CONFIG_IP6_NF_RAW is not set
+CONFIG_IP6_NF_RAW=m
 # CONFIG_IP6_NF_SECURITY is not set
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -1463,6 +1508,7 @@ CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
 CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 # CONFIG_BRIDGE_EBT_BROUTE is not set
 # CONFIG_BRIDGE_EBT_T_FILTER is not set
@@ -1484,8 +1530,6 @@ CONFIG_BRIDGE_EBT_MARK_T=m
 # CONFIG_BRIDGE_EBT_SNAT is not set
 # CONFIG_BRIDGE_EBT_LOG is not set
 # CONFIG_BRIDGE_EBT_NFLOG is not set
-CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=m
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1575,12 +1619,11 @@ CONFIG_NET_ACT_POLICE=m
 # CONFIG_NET_ACT_GACT is not set
 # CONFIG_NET_ACT_MIRRED is not set
 # CONFIG_NET_ACT_SAMPLE is not set
-# CONFIG_NET_ACT_IPT is not set
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_SIMP is not set
 # CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_CSUM is not set
+CONFIG_NET_ACT_CSUM=m
 # CONFIG_NET_ACT_MPLS is not set
 # CONFIG_NET_ACT_VLAN is not set
 # CONFIG_NET_ACT_BPF is not set
@@ -1663,6 +1706,7 @@ CONFIG_ETHTOOL_NETLINK=y
 CONFIG_HAVE_EISA=y
 # CONFIG_EISA is not set
 CONFIG_HAVE_PCI=y
+CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
@@ -1684,6 +1728,7 @@ CONFIG_PCI_QUIRKS=y
 CONFIG_PCI_ATS=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 # CONFIG_PCI_IOV is not set
+# CONFIG_PCI_NPEM is not set
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 # CONFIG_PCI_P2PDMA is not set
@@ -1716,6 +1761,11 @@ CONFIG_HOTPLUG_PCI=y
 # Mobiveil-based PCIe controllers
 #
 # end of Mobiveil-based PCIe controllers
+
+#
+# PLDA-based PCIe controllers
+#
+# end of PLDA-based PCIe controllers
 # end of PCI controller drivers
 
 #
@@ -1761,6 +1811,7 @@ CONFIG_FW_CACHE=y
 
 CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
@@ -1825,6 +1876,11 @@ CONFIG_UNACCEPTED_MEMORY=y
 # end of EFI (Extensible Firmware Interface) Support
 
 #
+# Qualcomm firmware drivers
+#
+# end of Qualcomm firmware drivers
+
+#
 # Tegra firmware driver
 #
 # end of Tegra firmware driver
@@ -1847,6 +1903,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
 CONFIG_CDROM=m
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_ZRAM is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
 # CONFIG_BLK_DEV_DRBD is not set
@@ -1868,7 +1925,7 @@ CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_HWMON=y
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TCP is not set
-# CONFIG_NVME_AUTH is not set
+# CONFIG_NVME_HOST_AUTH is not set
 # end of NVME Support
 
 #
@@ -1894,13 +1951,13 @@ CONFIG_NVME_HWMON=y
 # CONFIG_DW_XDATA_PCIE is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_XILINX_SDFEC is not set
+# CONFIG_NSM is not set
 # CONFIG_C2PORT is not set
 
 #
 # EEPROM support
 #
 # CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
@@ -1917,8 +1974,6 @@ CONFIG_NVME_HWMON=y
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MEI_ME is not set
-# CONFIG_INTEL_MEI_TXE is not set
 # CONFIG_VMWARE_VMCI is not set
 # CONFIG_GENWQE is not set
 # CONFIG_ECHO is not set
@@ -1928,6 +1983,7 @@ CONFIG_NVME_HWMON=y
 # CONFIG_MISC_RTSX_USB is not set
 # CONFIG_UACCE is not set
 # CONFIG_PVPANIC is not set
+# CONFIG_KEBA_CP500 is not set
 # end of Misc devices
 
 #
@@ -2124,8 +2180,6 @@ CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
 CONFIG_MD_RAID10=y
 CONFIG_MD_RAID456=y
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_MD_FAULTY is not set
 # CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
@@ -2164,6 +2218,7 @@ CONFIG_DM_VERITY=y
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
 # CONFIG_DM_AUDIT is not set
+# CONFIG_DM_VDO is not set
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set
 
@@ -2194,6 +2249,7 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 # CONFIG_BAREUDP is not set
 # CONFIG_GTP is not set
+# CONFIG_PFCP is not set
 # CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 CONFIG_NETCONSOLE=m
@@ -2206,6 +2262,7 @@ CONFIG_TAP=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
 # CONFIG_NLMON is not set
+# CONFIG_NETKIT is not set
 # CONFIG_NET_VRF is not set
 # CONFIG_VSOCKMON is not set
 # CONFIG_ARCNET is not set
@@ -2254,10 +2311,12 @@ CONFIG_IGB_HWMON=y
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
 # CONFIG_IGC is not set
+# CONFIG_IDPF is not set
 # CONFIG_JME is not set
 # CONFIG_NET_VENDOR_LITEX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_META is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -2285,6 +2344,7 @@ CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+# CONFIG_RTASE is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
@@ -2306,7 +2366,6 @@ CONFIG_R8169=m
 # CONFIG_NET_VENDOR_XILINX is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-# CONFIG_NET_SB1000 is not set
 CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
 # CONFIG_LED_TRIGGER_PHY is not set
@@ -2315,6 +2374,7 @@ CONFIG_FIXED_PHY=m
 #
 # MII PHY device drivers
 #
+# CONFIG_AIR_EN8811H_PHY is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_ADIN_PHY is not set
 # CONFIG_ADIN1100_PHY is not set
@@ -2349,6 +2409,8 @@ CONFIG_FIXED_PHY=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_NCN26000_PHY is not set
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
 # CONFIG_QSEMI_PHY is not set
 CONFIG_REALTEK_PHY=m
 # CONFIG_RENESAS_PHY is not set
@@ -2362,9 +2424,9 @@ CONFIG_REALTEK_PHY=m
 # CONFIG_DP83867_PHY is not set
 # CONFIG_DP83869_PHY is not set
 # CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
-# CONFIG_PSE_CONTROLLER is not set
 CONFIG_MDIO_DEVICE=m
 CONFIG_MDIO_BUS=m
 CONFIG_FWNODE_MDIO=m
@@ -2382,6 +2444,7 @@ CONFIG_MDIO_DEVRES=m
 #
 # PCS device drivers
 #
+# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers
 
 # CONFIG_PPP is not set
@@ -2483,7 +2546,6 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_LM8333 is not set
 # CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
 # CONFIG_KEYBOARD_MPR121 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
@@ -2546,6 +2608,7 @@ CONFIG_JOYSTICK_XPAD_FF=y
 # CONFIG_JOYSTICK_QWIIC is not set
 # CONFIG_JOYSTICK_FSIA6B is not set
 # CONFIG_JOYSTICK_SENSEHAT is not set
+# CONFIG_JOYSTICK_SEESAW is not set
 CONFIG_INPUT_TABLET=y
 # CONFIG_TABLET_USB_ACECAD is not set
 # CONFIG_TABLET_USB_AIPTEK is not set
@@ -2561,7 +2624,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMA140 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP5 is not set
 # CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
@@ -2569,6 +2631,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
 # CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
 # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
 # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
@@ -2582,7 +2645,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
@@ -2666,7 +2728,6 @@ CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
@@ -2759,7 +2820,6 @@ CONFIG_HPET=y
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 
@@ -2800,6 +2860,7 @@ CONFIG_I2C_PIIX4=m
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_ZHAOXIN is not set
 
 #
 # ACPI drivers
@@ -2809,8 +2870,7 @@ CONFIG_I2C_PIIX4=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_DESIGNWARE_CORE is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -2870,6 +2930,7 @@ CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 # CONFIG_PINCTRL_LYNXPOINT is not set
+# CONFIG_PINCTRL_INTEL_PLATFORM is not set
 # CONFIG_PINCTRL_ALDERLAKE is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
@@ -2883,6 +2944,7 @@ CONFIG_PINCTRL=y
 # CONFIG_PINCTRL_LAKEFIELD is not set
 # CONFIG_PINCTRL_LEWISBURG is not set
 # CONFIG_PINCTRL_METEORLAKE is not set
+# CONFIG_PINCTRL_METEORPOINT is not set
 # CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_TIGERLAKE is not set
 # end of Intel pinctrl drivers
@@ -2895,6 +2957,7 @@ CONFIG_PINCTRL=y
 # CONFIG_GPIOLIB is not set
 # CONFIG_W1 is not set
 # CONFIG_POWER_RESET is not set
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_POWER_SUPPLY_HWMON is not set
@@ -2909,8 +2972,8 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_LTC4162L is not set
@@ -2921,6 +2984,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
+# CONFIG_FUEL_GAUGE_MM8013 is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2932,7 +2996,6 @@ CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2948,6 +3011,7 @@ CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
 # CONFIG_SENSORS_AS370 is not set
 # CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
 # CONFIG_SENSORS_K8TEMP is not set
 CONFIG_SENSORS_K10TEMP=m
@@ -2955,6 +3019,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_CHIPCAP2 is not set
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
 # CONFIG_SENSORS_CORSAIR_PSU is not set
 # CONFIG_SENSORS_DRIVETEMP is not set
@@ -2967,6 +3032,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_FSCHMD is not set
 # CONFIG_SENSORS_FTSTEUTATES is not set
+# CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_G760A is not set
@@ -2977,17 +3043,21 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_CORETEMP is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWERZ is not set
 # CONFIG_SENSORS_POWR1220 is not set
+# CONFIG_SENSORS_LENOVO_EC is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2991 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
 # CONFIG_SENSORS_LTC4222 is not set
 # CONFIG_SENSORS_LTC4245 is not set
 # CONFIG_SENSORS_LTC4260 is not set
 # CONFIG_SENSORS_LTC4261 is not set
+# CONFIG_SENSORS_LTC4282 is not set
 # CONFIG_SENSORS_MAX127 is not set
 # CONFIG_SENSORS_MAX16065 is not set
 # CONFIG_SENSORS_MAX1619 is not set
@@ -2999,7 +3069,6 @@ CONFIG_SENSORS_FAM15H_POWER=m
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -3033,11 +3102,13 @@ CONFIG_SENSORS_NCT6775=m
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
 # CONFIG_SENSORS_NZXT_SMART2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_OXP is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PT5161L is not set
 # CONFIG_SENSORS_SBTSI is not set
 # CONFIG_SENSORS_SBRMI is not set
 # CONFIG_SENSORS_SHT21 is not set
@@ -3063,6 +3134,7 @@ CONFIG_SENSORS_NCT6775=m
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3101,7 +3173,6 @@ CONFIG_THERMAL=y
 # CONFIG_THERMAL_STATISTICS is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -3148,6 +3219,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # Watchdog Device Drivers
 #
 # CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_LENOVO_SE10_WDT is not set
 # CONFIG_WDAT_WDT is not set
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_ZIIRAVE_WATCHDOG is not set
@@ -3287,6 +3359,7 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ATC260X_I2C is not set
+# CONFIG_MFD_CS40L50_I2C is not set
 # end of Multifunction device drivers
 
 # CONFIG_REGULATOR is not set
@@ -3305,8 +3378,7 @@ CONFIG_BCMA_POSSIBLE=y
 #
 CONFIG_APERTURE_HELPERS=y
 CONFIG_SCREEN_INFO=y
-CONFIG_VIDEO_CMDLINE=y
-CONFIG_VIDEO_NOMODESET=y
+CONFIG_VIDEO=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AGP=m
 CONFIG_AGP_AMD64=m
@@ -3316,16 +3388,18 @@ CONFIG_AGP_INTEL=m
 CONFIG_INTEL_GTT=m
 # CONFIG_VGA_SWITCHEROO is not set
 CONFIG_DRM=m
+# CONFIG_DRM_DEBUG_MM is not set
 CONFIG_DRM_KMS_HELPER=m
+# CONFIG_DRM_PANIC is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_DISPLAY_HELPER=m
+# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
+# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 CONFIG_DRM_DISPLAY_HDCP_HELPER=y
 CONFIG_DRM_DISPLAY_HDMI_HELPER=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_TTM=m
 CONFIG_DRM_EXEC=m
 CONFIG_DRM_BUDDY=m
@@ -3352,6 +3426,7 @@ CONFIG_DRM_AMDGPU=m
 # CONFIG_DRM_AMDGPU_SI is not set
 # CONFIG_DRM_AMDGPU_CIK is not set
 CONFIG_DRM_AMDGPU_USERPTR=y
+# CONFIG_DRM_AMD_ISP is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
@@ -3370,6 +3445,7 @@ CONFIG_HSA_AMD=y
 CONFIG_HSA_AMD_SVM=y
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_I915 is not set
+# CONFIG_DRM_XE is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_VMWGFX is not set
@@ -3395,7 +3471,6 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # end of Display Interface Bridges
 
-# CONFIG_DRM_LOONGSON is not set
 # CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
@@ -3404,7 +3479,6 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_VBOXVIDEO is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
-# CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 
 #
@@ -3428,7 +3502,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_RADEON is not set
 # CONFIG_FB_ATY128 is not set
@@ -3464,7 +3537,7 @@ CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_SYSMEM_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
@@ -3479,12 +3552,14 @@ CONFIG_FB_TILEBLITTING=y
 #
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_KTD2801 is not set
 # CONFIG_BACKLIGHT_KTZ8866 is not set
 # CONFIG_BACKLIGHT_APPLE is not set
 # CONFIG_BACKLIGHT_QCOM_WLED is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -3628,6 +3703,7 @@ CONFIG_HID_SUNPLUS=m
 # CONFIG_HID_U2FZERO is not set
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
+# CONFIG_HID_WINWING is not set
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
@@ -3673,6 +3749,7 @@ CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 CONFIG_USB_PCI=y
+CONFIG_USB_PCI_AMD=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 #
@@ -3685,6 +3762,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_OTG_PRODUCTLIST is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
 CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
 CONFIG_USB_MON=m
 
 #
@@ -3780,6 +3858,7 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_APPLE_MFI_FASTCHARGE is not set
+# CONFIG_USB_LJCA is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
@@ -3873,8 +3952,8 @@ CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 # CONFIG_LEDS_TRIGGER_PATTERN is not set
-CONFIG_LEDS_TRIGGER_AUDIO=m
 # CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set
 
 #
 # Simple LED drivers
@@ -3925,6 +4004,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX31335 is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3939,12 +4019,14 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTC_DRV_FM3130 is not set
 # CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8111 is not set
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD2405AL is not set
 # CONFIG_RTC_DRV_SD3078 is not set
 
 #
@@ -4003,6 +4085,7 @@ CONFIG_DMA_ACPI=y
 # CONFIG_PLX_DMA is not set
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_XDMA is not set
+# CONFIG_AMD_QDMA is not set
 # CONFIG_AMD_PTDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -4051,7 +4134,7 @@ CONFIG_VFIO_PCI_VGA=y
 # CONFIG_VFIO_PCI_IGD is not set
 # end of VFIO support for PCI devices
 
-CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VMGENID=y
 # CONFIG_VBOXGUEST is not set
@@ -4067,6 +4150,7 @@ CONFIG_VIRTIO_BALLOON=m
 # CONFIG_VIRTIO_MEM is not set
 # CONFIG_VIRTIO_INPUT is not set
 # CONFIG_VIRTIO_MMIO is not set
+# CONFIG_VIRTIO_DEBUG is not set
 # CONFIG_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_TASK=y
@@ -4085,6 +4169,7 @@ CONFIG_VHOST_VSOCK=m
 # CONFIG_GREYBUS is not set
 # CONFIG_COMEDI is not set
 # CONFIG_STAGING is not set
+# CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
@@ -4099,9 +4184,9 @@ CONFIG_ACPI_WMI=m
 # CONFIG_ACERHDF is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACER_WMI is not set
-# CONFIG_AMD_PMF is not set
 # CONFIG_AMD_PMC is not set
 # CONFIG_AMD_HSMP is not set
+# CONFIG_AMD_WBRF is not set
 # CONFIG_ADV_SWBUTTON is not set
 # CONFIG_APPLE_GMUX is not set
 # CONFIG_ASUS_LAPTOP is not set
@@ -4109,19 +4194,16 @@ CONFIG_ACPI_WMI=m
 # CONFIG_EEEPC_LAPTOP is not set
 # CONFIG_X86_PLATFORM_DRIVERS_DELL is not set
 # CONFIG_AMILO_RFKILL is not set
-# CONFIG_FUJITSU_LAPTOP is not set
 # CONFIG_FUJITSU_TABLET is not set
 # CONFIG_GPD_POCKET_FAN is not set
 # CONFIG_X86_PLATFORM_DRIVERS_HP is not set
 # CONFIG_WIRELESS_HOTKEY is not set
 # CONFIG_IBM_RTL is not set
 # CONFIG_IDEAPAD_LAPTOP is not set
-# CONFIG_LENOVO_YMC is not set
 # CONFIG_SENSORS_HDAPS is not set
 # CONFIG_THINKPAD_LMI is not set
 # CONFIG_INTEL_IFS is not set
 # CONFIG_INTEL_SAR_INT1092 is not set
-# CONFIG_INTEL_PMC_CORE is not set
 
 #
 # Intel Speed Select Technology interface support
@@ -4146,8 +4228,10 @@ CONFIG_ACPI_WMI=m
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_TURBO_MAX_3 is not set
 # CONFIG_INTEL_VSEC is not set
+# CONFIG_ACPI_QUICKSTART is not set
 # CONFIG_MSI_LAPTOP is not set
 # CONFIG_MSI_WMI is not set
+# CONFIG_MSI_WMI_PLATFORM is not set
 # CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_SAMSUNG_Q10 is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
@@ -4158,7 +4242,10 @@ CONFIG_ACPI_WMI=m
 # CONFIG_PANASONIC_LAPTOP is not set
 # CONFIG_SONY_LAPTOP is not set
 # CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_SERIAL_MULTI_INSTANTIATE is not set
 # CONFIG_MLX_PLATFORM is not set
+# CONFIG_INSPUR_PLATFORM_PROFILE is not set
+# CONFIG_LENOVO_WMI_CAMERA is not set
 # CONFIG_INTEL_IPS is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
@@ -4202,8 +4289,9 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
+CONFIG_IOMMU_SVA=y
+CONFIG_IOMMU_IOPF=y
 CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_V2=y
 # CONFIG_INTEL_IOMMU is not set
 # CONFIG_IOMMUFD is not set
 CONFIG_IRQ_REMAP=y
@@ -4273,6 +4361,31 @@ CONFIG_IRQ_REMAP=y
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers
 
+#
+# PM Domains
+#
+
+#
+# Amlogic PM Domains
+#
+# end of Amlogic PM Domains
+
+#
+# Broadcom PM Domains
+#
+# end of Broadcom PM Domains
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+
+#
+# Qualcomm PM Domains
+#
+# end of Qualcomm PM Domains
+# end of PM Domains
+
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_EXTCON is not set
 # CONFIG_MEMORY is not set
@@ -4312,6 +4425,7 @@ CONFIG_IRQ_REMAP=y
 #
 # Performance monitor support
 #
+# CONFIG_DWC_PCIE_PMU is not set
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -4339,14 +4453,7 @@ CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX=y
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_SYSFS is not set
-
-#
-# Layout Types
-#
-# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
-# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
-# end of Layout Types
-
+# CONFIG_NVMEM_LAYOUTS is not set
 # CONFIG_NVMEM_RMEM is not set
 
 #
@@ -4372,6 +4479,7 @@ CONFIG_NVMEM=y
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 CONFIG_FS_IOMAP=y
+CONFIG_FS_STACK=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 # CONFIG_EXT2_FS is not set
@@ -4391,6 +4499,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_BTRFS_FS is not set
 # CONFIG_NILFS2_FS is not set
 # CONFIG_F2FS_FS is not set
+# CONFIG_BCACHEFS_FS is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
@@ -4414,6 +4523,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 # CONFIG_CUSE is not set
 CONFIG_VIRTIO_FS=m
+CONFIG_FUSE_PASSTHROUGH=y
 CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
@@ -4427,7 +4537,10 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
-# CONFIG_FSCACHE is not set
+# CONFIG_NETFS_DEBUG is not set
+CONFIG_FSCACHE=y
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_CACHEFILES is not set
 # end of Caches
 
 #
@@ -4450,11 +4563,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_EXFAT_FS=m
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_NTFS_FS is not set
 CONFIG_NTFS3_FS=m
 # CONFIG_NTFS3_64BIT_CLUSTER is not set
 CONFIG_NTFS3_LZX_XPRESS=y
 # CONFIG_NTFS3_FS_POSIX_ACL is not set
+# CONFIG_NTFS_FS is not set
 # end of DOS/FAT/EXFAT/NT Filesystems
 
 #
@@ -4475,9 +4588,10 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_INODE64 is not set
 # CONFIG_TMPFS_QUOTA is not set
 CONFIG_HUGETLBFS=y
+# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y
-# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set
+CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_EFIVAR_FS=m
@@ -4532,9 +4646,11 @@ CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
@@ -4548,10 +4664,12 @@ CONFIG_NFSD_V4=y
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
 # CONFIG_NFSD_V4_2_INTER_SSC is not set
 # CONFIG_NFSD_V4_SECURITY_LABEL is not set
+CONFIG_NFSD_LEGACY_CLIENT_TRACKING=y
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
+# CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
@@ -4570,6 +4688,8 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SWN_UPCALL is not set
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_COMPRESSION is not set
 # CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=m
 # CONFIG_CODA_FS is not set
@@ -4756,7 +4876,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography
 
@@ -4788,14 +4907,12 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_ARC4=y
 # CONFIG_CRYPTO_CHACHA20 is not set
 CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
 # CONFIG_CRYPTO_KEYWRAP is not set
 # CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_OFB is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=m
 # end of Length-preserving ciphers and modes
@@ -4849,7 +4966,7 @@ CONFIG_CRYPTO_CRC32C=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 # CONFIG_CRYPTO_LZ4 is not set
 # CONFIG_CRYPTO_LZ4HC is not set
@@ -4866,7 +4983,9 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=m
 CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_KDF800108_CTR=y
 # end of Random number generation
 
@@ -4879,7 +4998,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_RNG is not set
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
-# CONFIG_CRYPTO_STATS is not set
 # end of Userspace interface
 
 CONFIG_CRYPTO_HASH_INFO=y
@@ -4933,6 +5051,7 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
 # CONFIG_CRYPTO_DEV_QAT_C62X is not set
 # CONFIG_CRYPTO_DEV_QAT_4XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_420XX is not set
 # CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
@@ -4971,7 +5090,6 @@ CONFIG_GENERIC_NET_UTILS=y
 # CONFIG_CORDIC is not set
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
@@ -5030,10 +5148,11 @@ CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_ARM64=y
 CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_RISCV=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
@@ -5052,7 +5171,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_SG_DMA_FLAGS=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -5060,6 +5179,7 @@ CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
 CONFIG_SWIOTLB=y
 # CONFIG_SWIOTLB_DYNAMIC is not set
+CONFIG_DMA_NEED_SYNC=y
 CONFIG_DMA_COHERENT_POOL=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
@@ -5072,12 +5192,14 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 # CONFIG_IRQ_POLL is not set
 CONFIG_MPILIB=y
-# CONFIG_CTF is not set
+CONFIG_DIMLIB=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_TIME_NS=y
+CONFIG_GENERIC_VDSO_OVERFLOW_PROTECT=y
+CONFIG_VDSO_GETRANDOM=y
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -5090,9 +5212,13 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_COPY_MC=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
+CONFIG_STACKDEPOT_MAX_FRAMES=64
 CONFIG_SBITMAP=y
+# CONFIG_LWQ_TEST is not set
 # end of Library routines
 
+CONFIG_FIRMWARE_TABLE=y
+
 #
 # Kernel hacking
 #
@@ -5117,7 +5243,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 #
 # Compile-time checks and compiler options
 #
-CONFIG_AS_HAS_NON_CONST_LEB128=y
+CONFIG_AS_HAS_NON_CONST_ULEB128=y
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_HEADERS_INSTALL is not set
@@ -5135,7 +5261,7 @@ CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
 # CONFIG_DEBUG_FS is not set
 CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+CONFIG_ARCH_HAS_UBSAN=y
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_ARCH_KCSAN=y
 CONFIG_HAVE_KCSAN_COMPILER=y
@@ -5165,6 +5291,7 @@ CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y
+# CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -5191,10 +5318,9 @@ CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 # Scheduler Debugging
 #
 CONFIG_SCHED_INFO=y
+# CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
diff --git a/hosts/moyo/scripts/gen-dracut b/hosts/moyo/scripts/gen-dracut
index ad9d4dd..a320b18 100755
--- a/hosts/moyo/scripts/gen-dracut
+++ b/hosts/moyo/scripts/gen-dracut
@@ -1,2 +1,2 @@
 #! /usr/bin/env sh
-dracut -a lvm --kver=6.6.67-gentoo --force
+dracut -a lvm --kver=6.12.21-gentoo --force
diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix
index 9c61f4e..b346322 100644
--- a/hosts/sofue/configuration.nix
+++ b/hosts/sofue/configuration.nix
@@ -158,8 +158,10 @@ in rec {
     homeDir = "${config.users.users.andrew.home}";
   in {
     programs.kitty = {
+      # My understanding is that if repaint_delay equates to a refresh rate
+      # of just under my monitor's that VRR can avoid all tearing.
       extraConfig = ''
-        repaint_delay 4
+        repaint_delay 7
         input_delay 1
       '';
     };
@@ -186,8 +188,8 @@ in rec {
             transform = "270";
             #position = "1920 0";
             position = "0 0";
-            allow_tearing = "yes";
-            max_render_time = "off";
+            allow_tearing = "no";
+            max_render_time = "7";
             render_bit_depth = "10";
             bg = "#${colo.background-alt} solid_color";
           };
diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix
index 44a462b..6f2aeca 100644
--- a/hosts/yashinoki/configuration.nix
+++ b/hosts/yashinoki/configuration.nix
@@ -53,6 +53,7 @@ in {
     };
     monitors = {
       monitor1 = "eDP-1";
+      monitor2 = "DP-2";
     };
   };
 
@@ -147,7 +148,7 @@ in {
     linuxPackages_latest.perf
     linuxPackages_latest.cpupower
     (pkgs.writeShellScriptBin "run-sway" ''
-      export WLR_RENDERER=gles2
+      export WLR_RENDERER=vulkan
       export WLR_DRM_DEVICES=/dev/dri/card1
       cd $HOME
       exec ${pkgs.sway}/bin/sway
@@ -159,24 +160,35 @@ in {
   in {
     programs.kitty = {
       extraConfig = ''
-        repaint_delay 15
+        repaint_delay 9
         input_delay 3
       '';
     };
     wayland.windowManager.sway = let
       monitor1 = loc.monitors.monitor1;
+      monitor2 = loc.monitors.monitor2;
     in {
       checkConfig = false;
       config = {
         output = {
           "${monitor1}" = {
             mode = "3000x2000@59.999Hz";
+            position = "1920 540";
             render_bit_depth = "10";
-            max_render_time = "off";
-            allow_tearing = "yes";
+            allow_tearing = "no";
+            max_render_time = "10";
             scale = "2";
             bg = "${../../themes/year_of_snake/wallpaper.png} fit";
           };
+          "${monitor2}" = {
+            mode = "1920x1080@60.000Hz";
+            position = "0 0";
+            render_bit_depth = "10";
+            allow_tearing = "no";
+            max_render_time = "10";
+            scale = "1";
+            bg = "#${colo.background-alt} solid_color";
+          };
         };
         workspaceOutputAssign = [
           { workspace = "1"; output = "${monitor1}"; }
@@ -184,6 +196,10 @@ in {
           { workspace = "3"; output = "${monitor1}"; }
           { workspace = "4"; output = "${monitor1}"; }
           { workspace = "5"; output = "${monitor1}"; }
+          { workspace = "6"; output = "${monitor2}"; }
+          { workspace = "7"; output = "${monitor2}"; }
+          { workspace = "8"; output = "${monitor2}"; }
+          { workspace = "9"; output = "${monitor2}"; }
         ];
         keybindings = let
           mod1 = "Mod1";
@@ -194,11 +210,19 @@ in {
           "${mod1}+3" = "workspace 3";
           "${mod1}+4" = "workspace 4";
           "${mod1}+5" = "workspace 5";
+          "${mod4}+1" = "workspace 6";
+          "${mod4}+2" = "workspace 7";
+          "${mod4}+3" = "workspace 8";
+          "${mod4}+4" = "workspace 9";
           "${mod1}+Shift+1" = "move container to workspace 1";
           "${mod1}+Shift+2" = "move container to workspace 2";
           "${mod1}+Shift+3" = "move container to workspace 3";
           "${mod1}+Shift+4" = "move container to workspace 4";
           "${mod1}+Shift+5" = "move container to workspace 5";
+          "${mod4}+Shift+1" = "move container to workspace 6";
+          "${mod4}+Shift+2" = "move container to workspace 7";
+          "${mod4}+Shift+3" = "move container to workspace 8";
+          "${mod4}+Shift+4" = "move container to workspace 9";
           "${mod4}+r" = "exec swaymsg -- output ${monitor1} transform 270";
           "${mod4}+Shift+r" = "exec swaymsg -- output ${monitor1} transform 0";
           "${mod4}+F1" = "exec swaymsg -- output ${monitor1} bg \\#${colo.background-alt} solid_color";
diff --git a/nix/gaming.nix b/nix/gaming.nix
index 462e5bb..f43a21f 100644
--- a/nix/gaming.nix
+++ b/nix/gaming.nix
@@ -7,6 +7,8 @@ in {
   };
   environment.systemPackages = with pkgs; lib.lists.flatten [
     mangohud
+    (asNeeded "gamepad-tool" ["gamepad-tool"])
+    (asNeeded "sdl-jstest" ["sdl-jstest" "sdl2-jstest"])
     (asNeeded "protontricks" ["protontricks" "protontricks-launch"])
     (asNeeded "[lutris umu-launcher]" ["lutris"])
     (asNeeded "prismlauncher" ["prismlauncher"])
@@ -30,7 +32,8 @@ in {
       export DXVK_HUD=compiler
       export DXVK_LOG_LEVEL=none
       export DXVK_DEBUG=none
-      export VKD3D_CONFIG=dxr,small_vram_rebar
+      export VKD3D_HUD=compiler
+      export VKD3D_CONFIG=dxr
       export VKD3D_DEBUG=none
       export VKD3D_SHADER_DEBUG=none
       export mesa_glthread=true
diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix
index da5aa09..6ee2751 100644
--- a/nix/programs/firefox.nix
+++ b/nix/programs/firefox.nix
@@ -19,8 +19,8 @@ in {
       source = (pkgs.fetchFromGitHub {
         owner = "rafaelmardojai";
         repo = "firefox-gnome-theme";
-        rev = "a1795946debb5f21dfa5d328a6f1b68984f810fc";
-        hash = "sha256-CoGE9+8oVnnOOTStPQ9C87gp0C6vgf0tN3ls7MuKZiE=";
+        rev = "59e3de00f01e5adb851d824cf7911bd90c31083a";
+        hash = "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=";
       });
     };
     home.file."customChrome.css" = {
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index 5f0c91b..624c0b0 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -25,6 +25,8 @@ in {
         allow_remote_control yes
         linux_display_server wayland
         remember_window_size no
+        initial_window_width 720
+        initial_window_height 480
         resize_debounce_time 0.025 0.5
         placement_strategy top-left
         scrollback_lines 3000
@@ -35,7 +37,7 @@ in {
         cursor_shape block
         #cursor_blink_interval -1 linear ease-out
         #cursor_stop_blinking_after 20.0
-        cursor_trail 35
+        cursor_trail 50
         cursor_trail_decay 0.1 0.5
         cursor_trail_start_threshold 2
         foreground #${colo.foreground}
@@ -74,6 +76,7 @@ in {
           mod1 = "Mod1";
         in {
           "${mod1}+Return" = "exec ${terminal}";
+          "${mod1}+backslash" = "exec ${terminal} --class=\"kitty-popup\"";
         };
       };
     };
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index 5ff902f..d60b752 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -64,7 +64,7 @@ let
       hi NormalFloat                                    guibg=#${colo.color4}
       hi Pmenu                                          guibg=#${colo.color4}
       hi PmenuThumb                                     guibg=#${colo.color5}
-      hi PmenuSel                                       guibg=#${colo.color3}
+      hi PmenuSel                                       guibg=#${colo.color4} " Font color.
       hi PmenuSbar                                      guibg=#${colo.color4}
       hi Question             guifg=#${colo.color3}
       hi QuickFixLine         guifg=#${colo.color3}
@@ -82,7 +82,7 @@ let
       hi StatusLine           guifg=#${colo.background} guibg=#${colo.color5}
       hi StatusLineNC         guifg=#${colo.background} guibg=#${colo.color4}
       hi Title                guifg=#${colo.foreground}                           gui=bold
-      hi Visual                                         guibg=#${colo.color6}
+      hi Visual                                         guibg=#${colo.color3}
       hi WarningMsg           guifg=#${colo.color3}
       hi WinBar               guifg=#${colo.color5}     guibg=#${colo.background} gui=bold
       hi WinBarNC             guifg=#${colo.color5}     guibg=#${colo.background}
@@ -116,7 +116,6 @@ let
       hi Number       guifg=#${colo.foreground}
       " -----
       hi link Boolean     Number
-      hi link Character   Number
       hi link Character   String
       hi link SpecialChar Character
 
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index 49efdf6..33660bc 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -270,9 +270,9 @@ in {
           titlebar = false;
           commands = [
             { command = "move to scratchpad"; criteria.app_id = "kitty-server"; }
-            #{ command = "max_render_time 1"; criteria.app_id = "kitty"; }
+            { command = "floating enable; allow_tearing yes"; criteria.app_id = "kitty-popup"; }
             { command = "allow_tearing yes"; criteria.app_id = "kitty"; }
-            { command = "inhibit_idle fullscreen; floating enable; max_render_time 1; allow_tearing yes"; criteria.app_id = "cmv"; }
+            { command = "inhibit_idle fullscreen; floating enable; allow_tearing yes"; criteria.app_id = "cmv"; }
             { command = "floating enable"; criteria.class = "cmv.exe"; }
             { command = "floating enable"; criteria.app_id = "mauri"; }
             { command = "inhibit_idle fullscreen"; criteria.title = "Parsec"; }
diff --git a/nix/user.nix b/nix/user.nix
index 89b6fe1..d81e6c2 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -147,7 +147,7 @@ in {
       desktop = "${homeDir}/tmp";
       documents = "${homeDir}/docs";
       download = "${homeDir}/dl";
-      music = "${homeDir}/music";
+      music = "${homeDir}/tmp";
       pictures = "${homeDir}/pics";
       publicShare = "${homeDir}/tmp";
       templates = "${homeDir}/tmp";
@@ -161,7 +161,7 @@ in {
       userEmail = "andrew@akon.city";
       userName = "Andrew Opalach";
       signing = {
-        key = "99659CB58598BDDB";
+        key = "99659CB58598BDDB"; # The last digits of the key.
         signByDefault = true;
       };
       extraConfig = {
diff --git a/scripts/install-as-needed b/scripts/install-as-needed
index ab48655..9db4ff1 100755
--- a/scripts/install-as-needed
+++ b/scripts/install-as-needed
@@ -1,3 +1,5 @@
 #! /usr/bin/env sh
 export NIXPKGS_ALLOW_UNFREE=1
-nix shell --impure --expr "with (import (builtins.getFlake ''nixpkgs'') {});$1" --command ${@:2}
+PKG=$1
+shift
+nix shell --impure --expr "with (import (builtins.getFlake ''nixpkgs'') {});$PKG" --command "$@"