From 5755f2679d9104e7f41c8277fe76a0a3c12f8cbb Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Mon, 10 Jan 2022 02:27:04 -0500
Subject: [PATCH] Enable MuQSS

---
 desktop.nix        | 16 +++++++++++++---
 flake.lock         | 30 +++++++++++++++---------------
 modules/common.nix |  2 +-
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/desktop.nix b/desktop.nix
index d395c98..79b696f 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   ## Boot, drivers, and host name
   # Use grub
   boot.loader = {
@@ -18,8 +18,18 @@
   };
   # Enable AMD gpu drivers early
   boot.initrd.kernelModules = [ "amdgpu" ];
-  # Use the zen kernel
-  boot.kernelPackages = pkgs.linuxPackages_zen;
+  # Use the zen kernel with muqss turned on
+  boot.kernelPackages =
+    let
+      linuxZenWMuQSS = pkgs.linuxPackagesFor (pkgs.linuxPackages_zen.kernel.override {
+        structuredExtraConfig = with lib.kernel; {
+          SCHED_MUQSS = yes;
+        };
+        ignoreConfigErrors = true;
+      }
+      );
+    in
+    linuxZenWMuQSS;
   # Define the hostname, enable dhcp
   networking = {
     hostName = "levitation";
diff --git a/flake.lock b/flake.lock
index d35329f..05a9c10 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs": {
       "locked": {
-        "lastModified": 1641403537,
-        "narHash": "sha256-CdhQgrv9YsMvB+J6/wnI3JhSM1X97Gv9IbA4IY1pnb4=",
+        "lastModified": 1641786258,
+        "narHash": "sha256-jjlpeDe6T5ZxZu6nfB40TiZmYhA9sFLoqTe/qdWSpxE=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "2cb877e56ee4c3840d20a8cb8c39513e4dfac558",
+        "rev": "f798012d75cdddf50a374fd57ed2aea397d23e02",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1641363990,
-        "narHash": "sha256-1z3US3Zym05jzvJjjxoYJCwSMT05kcj3k6AUut5IuL4=",
+        "lastModified": 1641709553,
+        "narHash": "sha256-wFx7U4klsmMZIufILyojgPUTYmtmIVD/M7Wg0JgcbJc=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "178733b090b7b2eb6daab7dcaa77d0c6bf0d4a12",
+        "rev": "43fa994400794b5cb09ab9be894372c9e51bf7a6",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641244400,
-        "narHash": "sha256-8i4oasWEz/2y9U+F1XU15jfwSbd5YOEBh2tyBBm/W8E=",
+        "lastModified": 1641783572,
+        "narHash": "sha256-gkrIuUtbRKGEb+SrBVl6hEG4PY9rg+zhDyX0n3mRFMY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6019d8efb5530dcf7ce98086b8e091be5ff900a",
+        "rev": "79c7b6a353e22f0eec342dead0bc69fb7ce846db",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1641230035,
-        "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
+        "lastModified": 1641528457,
+        "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
+        "rev": "ff377a78794d412a35245e05428c8f95fef3951f",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1641336010,
-        "narHash": "sha256-pTiXGMuew6O54foUANAaly6xo8OucdKQPhFNoR6KwxM=",
+        "lastModified": 1641653161,
+        "narHash": "sha256-gajsOT+HAfCEngraBy1K7UmLpDdQo4wtmhnzju4qKLI=",
         "owner": "rust-analyzer",
         "repo": "rust-analyzer",
-        "rev": "c5049bdcdaefd7650a58fa9f393ad7351e5c5462",
+        "rev": "0f8c96c92689af8378dbe9f466c6bf15a3a27458",
         "type": "github"
       },
       "original": {
diff --git a/modules/common.nix b/modules/common.nix
index 0e82341..29c6797 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -12,7 +12,7 @@
   # Turn on compressed memory swap
   zramSwap = {
     enable = true;
-    algorithm = "zstd";
+    algorithm = "lz4";
     memoryPercent = 25;
   };
   # Automatically optimize and garbage collect the store