4 files changed, 13 insertions, 8 deletions
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index b6082451..354904e6 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -66,7 +66,8 @@ in {
   hardware.sane.enable = true;
   hardware.sane.extraBackends = [ pkgs.hplip ];
 
-  vuizvui.user.aszlig.system.kernel.enable = true;
+  vuizvui.system.kernel.bfq.enable = true;
+  vuizvui.system.kernel.useBleedingEdge = true;
   hardware.enableRedistributableFirmware = true;
 
   networking.hostName = "dnyarri";
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 21ba9b3a..bce332fb 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -8,7 +8,8 @@ let
 in {
   vuizvui.user.aszlig.profiles.workstation.enable = true;
 
-  vuizvui.user.aszlig.system.kernel.enable = true;
+  vuizvui.system.kernel.bfq.enable = true;
+  vuizvui.system.kernel.useBleedingEdge = true;
 
   boot = {
     initrd.kernelModules = [ "fbcon" "usb_storage" ];
diff --git a/modules/module-list.nix b/modules/module-list.nix
index aa05c117..a2efefc4 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -13,6 +13,7 @@
   ./services/starbound.nix
   ./system/iso.nix
   ./system/kernel/bfq
+  ./system/kernel/rckernel.nix
   ./user/aszlig/profiles/base.nix
   ./user/aszlig/profiles/managed.nix
   ./user/aszlig/profiles/workstation
@@ -27,7 +28,6 @@
   ./user/aszlig/services/i3
   ./user/aszlig/services/slim
   ./user/aszlig/services/vlock
-  ./user/aszlig/system/kernel.nix
   ./user/devhell/profiles/base.nix
   ./user/devhell/profiles/packages.nix
   ./user/devhell/profiles/services.nix
diff --git a/modules/user/aszlig/system/kernel.nix b/modules/system/kernel/rckernel.nix
index c8531e30..a3ccf907 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/system/kernel/rckernel.nix
@@ -1,13 +1,16 @@
 { config, pkgs, lib, ... }:
 
 {
-  options.vuizvui.user.aszlig.system.kernel = {
-    enable = lib.mkEnableOption "aszlig's custom kernel";
+  options.vuizvui.system.kernel.useBleedingEdge = lib.mkOption {
+    type = lib.types.bool;
+    default = false;
+    description = ''
+      Whether to always use the latest kernel, even if it's still a release
+      canidate version.
+    '';
   };
 
-  config = lib.mkIf config.vuizvui.user.aszlig.system.kernel.enable {
-    vuizvui.system.kernel.bfq.enable = true;
-
+  config = lib.mkIf config.vuizvui.system.kernel.useBleedingEdge {
     boot.kernelPackages = let
       inherit (lib) take splitString replaceStrings;
       inherit (pkgs) linux_latest linux_testing;