Add mt7927 driver to quark.

This reverts commit ee4794859a.

nix/configuration/configuration.nix

@@ -1,16 +1,9 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 
-let
-  alias_nix_pin_revision = pkgs.writeShellScriptBin "nix-pin-revision" ''
-    # Usage: nix-pin-revision nixpkgs 'github:NixOS/nixpkgs/00c21e4c93d963c50d4c0c89bfa84ed6e0694df2'
-    exec nix flake lock --override-input "''${@}"
-  '';
-in
 {
   imports = [
     ./roles/2ship2harkinian
@@ -54,7 +47,6 @@ in
     ./roles/iso_mount
     ./roles/jujutsu
     ./roles/kanshi
-    ./roles/kernel
     ./roles/kodi
     ./roles/kubernetes
     ./roles/latex
@@ -148,10 +140,6 @@ in
     };
     nix.settings.auto-optimise-store = !config.me.buildingPortable;
 
-    environment.systemPackages = [
-      alias_nix_pin_revision
-    ];
-
     environment.persistence."/persist" = lib.mkIf (config.me.mountPersistence) {
       hideMounts = true;
       directories = [
@@ -235,12 +223,13 @@ in
         );
       in
       [
-        (disableTests "deno") # Tests use too much disk space
-        (disableOptimizations "libtpms")
+        (disableTests "coreutils")
+        (disableTests "coreutils-full")
+        (disableTests "libuv")
+        (final: prev: {
+          inherit (final.unoptimized) libtpms libjxl;
+        })
         (disableOptimizationsPython3 "scipy")
-        (disableOptimizations "assimp")
-        (disableOptimizations "gsl")
-
         # Works but probably sets python2's scipy to be python3:
         #
         # (final: prev: {

nix/configuration/flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780290312,
-        "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
+        "lastModified": 1769524058,
+        "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
+        "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780243769,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
         "type": "github"
       },
       "original": {
@@ -178,22 +178,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-google": {
-      "locked": {
-        "lastModified": 1779893571,
-        "narHash": "sha256-wiwMyVCtmjRjlFCe2zaumCE6LRV9GzzN0ZH25NQkbAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1730741070,
@@ -242,8 +226,7 @@
         "disko": "disko",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-google": "nixpkgs-google"
+        "nixpkgs": "nixpkgs"
       }
     },
     "rust-overlay": {

nix/configuration/flake.nix

@@ -20,7 +20,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-google.url = "github:NixOS/nixpkgs/45f6cfaa4605b706c870e75bd74bdb5e97eee11e";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -29,16 +28,17 @@
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    mt7927.url = "github:cmspam/mt7927-nixos";
   };
 
   outputs =
     {
       self,
       nixpkgs,
-      nixpkgs-google,
       disko,
       impermanence,
       lanzaboote,
+      mt7927,
       ...
     }:
     let
@@ -80,6 +80,7 @@
             impermanence.nixosModules.impermanence
             lanzaboote.nixosModules.lanzaboote
             disko.nixosModules.disko
+            mt7927.nixosModules.default
             ./configuration.nix
             (./. + "/hosts/${hostname}")
             (./. + "/formats/${format}.nix")
@@ -94,9 +95,6 @@
                       hostPlatform.gcc.arch = "default";
                       hostPlatform.gcc.tune = "default";
                     };
-                    google = import nixpkgs-google {
-                      system = prev.stdenv.hostPlatform.system;
-                    };
                   })
                 ];
               };

nix/configuration/hosts/odo/SELF_BUILD

@@ -5,6 +5,7 @@ IFS=$'\n\t'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 : "${JOBS:="1"}"
+: "${NOM:="true"}"
 
 for f in /persist/manual/manual_add_to_store/*; do nix-store --add-fixed sha256 "$f"; done
 

nix/configuration/hosts/odo/default.nix

@@ -164,7 +164,7 @@
     me.zsh.enable = true;
 
     me.sm64ex.enable = true;
-    me.shipwright.enable = false;
+    me.shipwright.enable = true;
     me.ship2harkinian.enable = true;
   };
 }

nix/configuration/hosts/quark/default.nix

@@ -11,6 +11,7 @@
     ./hardware-configuration.nix
     ./power_management.nix
     ./waybar.nix
+    ./wifi.nix
   ];
 
   config = {
@@ -159,7 +160,7 @@
     me.zsh.enable = true;
 
     me.sm64ex.enable = true;
-    me.shipwright.enable = false;
+    me.shipwright.enable = true;
     me.ship2harkinian.enable = true;
   };
 }

nix/configuration/hosts/quark/wifi.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+
+  config = {
+    hardware.mediatek-mt7927 = {
+      enable = true;
+      enableWifi = true;
+      enableBluetooth = true;
+      # Highly recommended to fix upload speed issues
+      disableAspm = true;
+    };
+  };
+}

nix/configuration/roles/base/default.nix

@@ -14,12 +14,6 @@ let
   cleanup_temporary_files = (
     patchScriptBin "cleanup_temporary_files" (builtins.readFile ./files/cleanup_temporary_files.bash)
   );
-  decode_jwt = (patchScriptBin "decode_jwt" (builtins.readFile ./files/decode_jwt.bash));
-  git_find_merged_branches = (
-    patchScriptBin "git_find_merged_branches" (builtins.readFile ./files/git_find_merged_branches.bash)
-  );
-  git_fix_author = (patchScriptBin "git_fix_author" (builtins.readFile ./files/git_fix_author.bash));
-  rsync_clone = (patchScriptBin "rsync_clone" (builtins.readFile ./files/rsync_clone.bash));
   alias_rga = pkgs.writeShellScriptBin "rga" ''
     exec ${pkgs.ripgrep}/bin/rg -uuu "''${@}"
   '';
@@ -65,12 +59,8 @@ in
       nix-output-monitor # For better view into nixos-rebuild
       # nix-serve-ng # Serve nix store over http
       cleanup_temporary_files
-      decode_jwt
       jq
       inetutils # For whois
-      git_find_merged_branches
-      git_fix_author
-      rsync_clone
     ];
   };
 }

nix/configuration/roles/base/files/cleanup_temporary_files.bash

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
 #
 # Delete temporary files on entire disk
-set -euo pipefail
-IFS=$'\n\t'
-
-exec find / -type f '(' -name '*.orig' -or -name '*~' -or -name '*.core' ')' -delete -print 2>/dev/null
+find / -type f '(' -name '*.orig' -or -name '*~' -or -name '*.core' ')' -delete -print 2>/dev/null

nix/configuration/roles/base/files/decode_jwt.bash

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-#
-# Decode the contents of a JWT
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-exec jq -R 'split(".") | .[0],.[1] | gsub("-"; "+") | gsub("_"; "/") | gsub("%3D"; "=")| @base64d | fromjson'

nix/configuration/roles/base/files/git_find_merged_branches.bash

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-#
-# Find local branches that have been merged
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-: ${MAIN_BRANCH:="main"}
-
-git checkout -q ${MAIN_BRANCH} && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base ${MAIN_BRANCH} $branch) && [[ $(git cherry ${MAIN_BRANCH} $(git commit-tree $(git rev-parse "$branch^{tree}") -p $mergeBase -m _)) == "-"* ]] && echo "$branch"; done

nix/configuration/roles/base/files/git_fix_author.bash

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-#
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-git filter-branch --env-filter '
-WRONG_EMAIL="old@email.foo"
-NEW_NAME="New Name"
-NEW_EMAIL="new@email.bar"
-
-if [ "$GIT_COMMITTER_EMAIL" = "$WRONG_EMAIL" ]
-then
-    export GIT_COMMITTER_NAME="$NEW_NAME"
-    export GIT_COMMITTER_EMAIL="$NEW_EMAIL"
-fi
-if [ "$GIT_AUTHOR_EMAIL" = "$WRONG_EMAIL" ]
-then
-    export GIT_AUTHOR_NAME="$NEW_NAME"
-    export GIT_AUTHOR_EMAIL="$NEW_EMAIL"
-fi
-' --tag-name-filter cat --commit-filter 'git commit-tree -S "$@";' -- --branches --tags

nix/configuration/roles/base/files/rsync_clone.bash

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-#
-# Wrapper to set rsync flags for cloning a folder preserving attributes
-set -euo pipefail
-IFS=$'\n\t'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-exec rsync -aHAXS "$@"

nix/configuration/roles/gcloud/default.nix

@@ -18,7 +18,7 @@
   };
 
   config = lib.mkIf config.me.gcloud.enable {
-    environment.systemPackages = with pkgs.google; [
+    environment.systemPackages = with pkgs; [
       (google-cloud-sdk.withExtraComponents [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
     ];
 

nix/configuration/roles/graphics/default.nix

@@ -34,7 +34,7 @@
         environment.systemPackages = with pkgs; [
           mesa-demos # for glxgears
           vulkan-tools # for vkcube
-          xeyes # to test which windows are using x11
+          xorg.xeyes # to test which windows are using x11
         ];
         hardware.graphics.enable = true;
         # hardware.graphics.enable32Bit = true;

nix/configuration/roles/kernel/default.nix

@@ -1,308 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  preemption_type = with lib.kernel; {
-    full = {
-      PREEMPT_DYNAMIC = yes;
-      PREEMPT = yes;
-      PREEMPT_VOLUNTARY = lib.mkForce no;
-      PREEMPT_LAZY = lib.mkForce no;
-      PREEMPT_NONE = no;
-    };
-    lazy = {
-      PREEMPT_DYNAMIC = yes;
-      PREEMPT = no;
-      PREEMPT_VOLUNTARY = lib.mkForce no;
-      PREEMPT_LAZY = yes;
-      PREEMPT_NONE = no;
-    };
-    voluntary = {
-      PREEMPT_DYNAMIC = no;
-      PREEMPT = no;
-      PREEMPT_VOLUNTARY = yes;
-      PREEMPT_LAZY = lib.mkForce no;
-      PREEMPT_NONE = no;
-    };
-    none = {
-      PREEMPT_DYNAMIC = no;
-      PREEMPT = no;
-      PREEMPT_VOLUNTARY = lib.mkForce no;
-      PREEMPT_LAZY = lib.mkForce no;
-      PREEMPT_NONE = yes;
-    };
-  };
-  lto_type = with lib.kernel; {
-    none = {
-      LTO_NONE = yes;
-      LTO_CLANG_THIN = no;
-      LTO_CLANG_FULL = no;
-    };
-    thin = {
-      LTO_NONE = no;
-      LTO_CLANG_THIN = yes;
-      LTO_CLANG_FULL = no;
-    };
-    full = {
-      LTO_NONE = no;
-      LTO_CLANG_THIN = no;
-      LTO_CLANG_FULL = yes;
-    };
-  };
-  cpu_scheduler = with lib.kernel; {
-    # Burst-Oriented Response Enhancer
-    # For interactive workloads and gaming.
-    bore = {
-      SCHED_BORE = yes;
-    };
-    # Earliest Eligible Virtual Deadline First
-    # For general purpose computing.
-    eevdf = { };
-    # BitMap Queue CPU Scheduler
-    # For throughput-oriented workloads.
-    bmq = {
-      SCHED_ALT = yes;
-      SCHED_BMQ = yes;
-    };
-  };
-  tick_hz =
-    with lib.kernel;
-    {
-      "1000" = {
-        HZ_1000 = yes;
-        HZ = freeform "1000";
-      };
-    }
-    // lib.genAttrs [ "100" "250" "300" "500" "600" "750" ] (hz: {
-      HZ_1000 = no;
-      "HZ_${hz}" = yes;
-      HZ = freeform hz;
-    });
-  performance_governor = with lib.kernel; {
-    default = {
-      CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = yes;
-    };
-    performance = {
-      CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = no;
-      CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes;
-    };
-  };
-  cpu_type = with lib.kernel; {
-    x86_64-v1 = {
-      GENERIC_CPU = yes;
-      MZEN4 = no;
-      X86_NATIVE_CPU = no;
-      X86_64_VERSION = freeform "1";
-    };
-    x86_64-v2 = {
-      GENERIC_CPU = yes;
-      MZEN4 = no;
-      X86_NATIVE_CPU = no;
-      X86_64_VERSION = freeform "2";
-    };
-    x86_64-v3 = {
-      GENERIC_CPU = yes;
-      MZEN4 = no;
-      X86_NATIVE_CPU = no;
-      X86_64_VERSION = freeform "3";
-    };
-    x86_64-v4 = {
-      GENERIC_CPU = yes;
-      MZEN4 = no;
-      X86_NATIVE_CPU = no;
-      X86_64_VERSION = freeform "4";
-    };
-    zen4 = {
-      GENERIC_CPU = no;
-      MZEN4 = yes;
-      X86_NATIVE_CPU = no;
-    };
-    default = { };
-  };
-  my_cpu_type = lib.mkMerge [
-    (lib.mkIf (!config.me.optimizations.enable) cpu_type.default)
-    (lib.mkIf (
-      config.me.optimizations.enable && config.me.optimizations.arch == "x86-64-v1"
-    ) cpu_type.x86_64-v1)
-    (lib.mkIf (
-      config.me.optimizations.enable && config.me.optimizations.arch == "x86-64-v2"
-    ) cpu_type.x86_64-v2)
-    (lib.mkIf (
-      config.me.optimizations.enable && config.me.optimizations.arch == "x86-64-v3"
-    ) cpu_type.x86_64-v3)
-    (lib.mkIf (
-      config.me.optimizations.enable && config.me.optimizations.arch == "x86-64-v4"
-    ) cpu_type.x86_64-v4)
-    (lib.mkIf (
-      config.me.optimizations.enable && config.me.optimizations.arch == "znver4"
-    ) cpu_type.zen4)
-  ];
-  tick_rate = with lib.kernel; {
-    # Always tick at the hz frequency.
-    periodic = {
-      NO_HZ_IDLE = no;
-      NO_HZ_FULL = no;
-      NO_HZ = no;
-      NO_HZ_COMMON = no;
-      HZ_PERIODIC = yes;
-    };
-    # Idle - Do not disturb the CPU when idle. This can save power but increase latency.
-    idle = {
-      HZ_PERIODIC = no;
-      NO_HZ_FULL = no;
-      NO_HZ_IDLE = yes;
-      NO_HZ = yes;
-      NO_HZ_COMMON = yes;
-    };
-    # Full dyntick system (tickless) - The kernel tries to shut down the tick whenever possible.
-    tickless = {
-      HZ_PERIODIC = no;
-      NO_HZ_IDLE = no;
-      CONTEXT_TRACKING_FORCE = no;
-      NO_HZ_FULL_NODEF = yes;
-      NO_HZ_FULL = yes;
-      NO_HZ = yes;
-      NO_HZ_COMMON = yes;
-      CONTEXT_TRACKING = yes;
-    };
-  };
-  huge_page = with lib.kernel; {
-    always = {
-      TRANSPARENT_HUGEPAGE_MADVISE = no;
-      TRANSPARENT_HUGEPAGE_ALWAYS = yes;
-    };
-    madvise = {
-      TRANSPARENT_HUGEPAGE_ALWAYS = no;
-      TRANSPARENT_HUGEPAGE_MADVISE = yes;
-    };
-  };
-  io_scheduler = with lib.kernel; {
-    adios = {
-      MQ_IOSCHED_ADIOS = yes;
-    };
-    bfq = {
-      IOSCHED_BFQ = mkKernelOverride yes;
-    };
-  };
-  common_config =
-    with lib.kernel;
-    {
-      # Google's BBRv3 TCP congestion Control
-      TCP_CONG_BBR = yes;
-      DEFAULT_BBR = yes;
-
-      # TCP_CONG_CUBIC = module;
-      # DEFAULT_CUBIC = no;
-      # TCP_CONG_BBR = yes;
-      # DEFAULT_BBR = yes;
-      # DEFAULT_TCP_CONG = freeform "bbr";
-      # NET_SCH_FQ_CODEL = module;
-      # NET_SCH_FQ = yes;
-      # CONFIG_DEFAULT_FQ_CODEL = no;
-      # CONFIG_DEFAULT_FQ = yes;
-
-      # Enable the Control Flow Integrity sanitizer in clang
-      ARCH_SUPPORTS_CFI_CLANG = yes;
-      CFI_CLANG = yes;
-      CFI_AUTO_DEFAULT = yes;
-
-      # Use O3 optimizations
-      CC_OPTIMIZE_FOR_PERFORMANCE = no;
-      CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
-
-      # Enable Adaptive Deadline I/O Scheduler
-      MQ_IOSCHED_ADIOS = yes;
-    }
-    // my_cpu_type;
-  flavors = {
-    server = lib.mkMerge [
-      preemption_type.none
-      lto_type.full
-      cpu_scheduler.eevdf
-      tick_hz."300"
-      performance_governor.default
-      tick_rate.tickless
-      huge_page.madvise
-    ];
-    interactive =
-      with lib.kernel;
-      lib.mkMerge [
-        {
-          # Enable RCU Lazy - Reduces power consumption when idle or lightly loaded. Useful for battery-powered devices like laptops.
-          RCU_LAZY = yes;
-        }
-        preemption_type.lazy
-        lto_type.full
-        cpu_scheduler.bore
-        tick_hz."300"
-        performance_governor.default
-        tick_rate.tickless
-        huge_page.madvise
-      ];
-  };
-in
-{
-  imports = [ ];
-
-  options.me = {
-    kernel.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install kernel.";
-    };
-
-    kernel.version = lib.mkOption {
-      type = lib.types.str;
-      default = "linux"; # LTS
-      example = "linux_6_18";
-      description = "What version of the kernl should we use.";
-    };
-
-    kernel.flavor = lib.mkOption {
-      type = lib.types.str;
-      default = "interactive";
-      example = "server";
-      description = "What type of kernel should be built.";
-    };
-  };
-
-  config = lib.mkIf config.me.kernel.enable (
-    lib.mkMerge [
-      {
-        boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me;
-      }
-      (lib.mkIf (!config.me.optimizations.enable) {
-        nixpkgs.overlays = [
-          (final: prev: {
-            linux_me = final."${config.me.kernel.version}";
-          })
-        ];
-      })
-      (lib.mkIf (config.me.optimizations.enable) {
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              addConfig =
-                additionalConfig: pkg:
-                pkg.override (oldconfig: {
-                  structuredExtraConfig = lib.mkMerge ([ pkg.structuredExtraConfig ] ++ additionalConfig);
-                });
-            in
-            {
-              linux_me = addConfig ([
-                common_config
-                flavors."${config.me.kernel.flavor}"
-              ]) final."${config.me.kernel.version}";
-            }
-          )
-        ];
-      })
-    ]
-  );
-}

nix/configuration/roles/minimal_base/default.nix

@@ -19,7 +19,6 @@
 
   config = lib.mkIf config.me.minimal_base.enable {
     me.doas.enable = true;
-    me.kernel.enable = true;
     me.network.enable = true;
     me.nvme.enable = true;
     me.ssh.enable = true;

nix/configuration/roles/optimized_build/default.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 
@@ -48,13 +49,65 @@
   };
 
   config = lib.mkMerge [
+    (lib.mkIf (!config.me.optimizations.enable) (
+      lib.mkMerge [
+        {
+          boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_18;
+          # boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux;
+        }
+      ]
+    ))
     (lib.mkIf config.me.optimizations.enable (
       lib.mkMerge [
         {
+          boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_me;
+
           nixpkgs.hostPlatform = {
             gcc.arch = config.me.optimizations.arch;
             gcc.tune = config.me.optimizations.arch;
           };
+
+          nixpkgs.overlays = [
+            (
+              final: prev:
+              let
+                addConfig =
+                  additionalConfig: pkg:
+                  pkg.override (oldconfig: {
+                    structuredExtraConfig = pkg.structuredExtraConfig // additionalConfig;
+                  });
+              in
+              {
+                linux_me = addConfig {
+                  # Full preemption
+                  PREEMPT = lib.mkOverride 60 lib.kernel.yes;
+                  PREEMPT_VOLUNTARY = lib.mkOverride 60 lib.kernel.no;
+
+                  # Google's BBRv3 TCP congestion Control
+                  TCP_CONG_BBR = lib.kernel.yes;
+                  DEFAULT_BBR = lib.kernel.yes;
+
+                  # Preemptive Full Tickless Kernel at 300Hz
+                  HZ = lib.kernel.freeform "300";
+                  HZ_300 = lib.kernel.yes;
+                  HZ_1000 = lib.kernel.no;
+                } prev.linux_6_18; # or prev.linux
+              }
+            )
+            (final: prev: {
+              inherit (final.unoptimized)
+                assimp
+                binaryen
+                gsl
+                rapidjson
+                ffmpeg-headless
+                ffmpeg
+                pipewire
+                chromaprint
+                gtkmm
+                ;
+            })
+          ];
         }
       ]
     ))

nix/configuration/roles/recovery/default.nix

@@ -29,7 +29,7 @@
       }
       (lib.mkIf config.me.graphical {
         environment.systemPackages = with pkgs; [
-          #ddrescueview
+          ddrescueview
         ];
       })
     ]

nix/configuration/roles/rpcs3/default.nix

@@ -53,8 +53,6 @@ in
       rpcs3
     ];
 
-    allowedUnfree = [ "rpcs3" ];
-
     security.pam.loginLimits = [
       {
         domain = "@wheel";

nix/configuration/roles/sm64ex/default.nix

@@ -18,10 +18,7 @@
   };
 
   config = lib.mkIf (config.me.sm64ex.enable && config.me.graphical) {
-    allowedUnfree = [
-      "sm64ex"
-      "baserom.us.z64"
-    ];
+    allowedUnfree = [ "sm64ex" ];
 
     environment.systemPackages = with pkgs; [
       sm64ex

nix/configuration/roles/sound/default.nix

@@ -30,7 +30,7 @@
           # If you want to use JACK applications, uncomment this
           #jack.enable = true;
 
-          extraLadspaPackages = [ pkgs.rnnoise-plugin.ladspa ];
+          extraLv2Packages = [ pkgs.rnnoise-plugin ];
           configPackages = [
             (pkgs.writeTextDir "share/pipewire/pipewire.conf.d/99-input-denoising.conf" ''
               context.modules = [
@@ -43,7 +43,7 @@
                               {
                                   type = ladspa
                                   name = rnnoise
-                                  plugin = "librnnoise_ladspa"
+                                  plugin = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"
                                   label = noise_suppressor_mono
                                   control = {
                                       "VAD Threshold (%)" = 50.0

nix/configuration/roles/vscode/default.nix

@@ -121,12 +121,6 @@ in
             group = "talexander";
             mode = "0755";
           }
-          {
-            directory = ".vscode-shared";
-            user = "talexander";
-            group = "talexander";
-            mode = "0755";
-          }
         ];
       };
     };

nix/configuration/roles/zfs/default.nix

@@ -44,9 +44,6 @@ in
 
     boot.zfs.devNodes = "/dev/disk/by-partuuid";
 
-    # Do not force import your root pool during boot. Force importing would be useful if the pool had been imported by a different machine most recently.
-    boot.zfs.forceImportRoot = false;
-
     services.zfs = {
       autoScrub = {
         enable = true;