about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-07-20 00:02:00 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-07-20 00:02:00 +0200
commit48a9c6db6d985ebff7c00676c29ad50d7d1cee6c (patch)
tree1233f8c7881492b8de7b9bddb39c3e2a3fc19604 /modules
parent09b1cee2f722defa1ba8a0543ca0a9238b99d0d4 (diff)
Introduce new system.kernel.useBleedingEdge option
This dissolves the user.aszlig.system.kernel module, which was not only
to stay on the latest bleeding edge kernel but also to enable BFQ. The
latter has been factored out already a while ago already.

Originally, I had a fully custom kernel config for mmrnmhrm and dnyarri,
but it's no longer the case and thus the user.aszlig.system.kernel
module is now no longer needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
-rw-r--r--modules/module-list.nix2
-rw-r--r--modules/system/kernel/rckernel.nix (renamed from modules/user/aszlig/system/kernel.nix)13
2 files changed, 9 insertions, 6 deletions
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;