From 945cdcc5b2de50f77a0bdccca2c53267a117d4e2 Mon Sep 17 00:00:00 2001 From: adikro Date: Mon, 26 Jan 2026 00:02:16 +0100 Subject: merge with the laptop --- flake.lock | 36 ++++++------------------------------ hosts/desktop/configuration.nix | 2 +- hosts/pendrive/configuration.nix | 5 ++++- hosts/thinkpad/configuration.nix | 5 ++++- os/core/drivers.nix | 16 +++++++++++++--- 5 files changed, 28 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 91c2be7..2614606 100644 --- a/flake.lock +++ b/flake.lock @@ -157,35 +157,11 @@ ] }, "locked": { - "lastModified": 1769289524, - "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", + "lastModified": 1769381762, + "narHash": "sha256-Mf/8jPJvFXIL8s/gtSrU8PgXJy5Vz7seIU4D7WJmG0M=", "owner": "nix-community", "repo": "home-manager", -<<<<<<< Updated upstream - "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", -======= - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767901774, - "narHash": "sha256-Zf21x7yWdFI2lwNRcO76FjoKlB2sRCxNTW97ekeftvo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "37158e52675b77da7d2eab3579011659eaedde1d", ->>>>>>> Stashed changes + "rev": "2590268ca7627a3ec1a9c9422983495cea51e2e1", "type": "github" }, "original": { @@ -422,11 +398,11 @@ ] }, "locked": { - "lastModified": 1769374365, - "narHash": "sha256-H0dhx+rq1FT4tJcOXWLebdkuabTaWli8fXS1FarpDjc=", + "lastModified": 1769379906, + "narHash": "sha256-btQxa6MLgJcAlwivGK++cGzrvlyIXFRc3++qR5EuZ3Y=", "owner": "nix-community", "repo": "NUR", - "rev": "3cbc1fcdea9eac0fdf862b853c77c3ea175e5e59", + "rev": "3f0038c142806f43915c5d7c5dcd94782896705a", "type": "github" }, "original": { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index cc3cbf4..1197c3f 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -27,7 +27,7 @@ drivers = { enable = true; amdgpu.enable = true; - stability = "unstable"; + kernel = "unstable"; }; fonts.enable = true; greet.enable = true; diff --git a/hosts/pendrive/configuration.nix b/hosts/pendrive/configuration.nix index 56a2aad..37ab16e 100644 --- a/hosts/pendrive/configuration.nix +++ b/hosts/pendrive/configuration.nix @@ -16,7 +16,10 @@ audio.enable = true; bootloader = "systemd-boot"; - drivers.enable = true; + drivers = { + enable = true; + kernel = "hardened"; + }; fonts.enable = true; greet.enable = true; home-manager = { diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix index 08c3631..4713892 100644 --- a/hosts/thinkpad/configuration.nix +++ b/hosts/thinkpad/configuration.nix @@ -16,7 +16,10 @@ audio.enable = true; bootloader = "systemd-boot"; - drivers.enable = true; + drivers = { + enable = true; + kernel = "hardened"; + }; fonts.enable = true; greet.enable = true; home-manager = { diff --git a/os/core/drivers.nix b/os/core/drivers.nix index 41b03a4..a6905d5 100644 --- a/os/core/drivers.nix +++ b/os/core/drivers.nix @@ -12,10 +12,12 @@ in options.os.core.drivers = { enable = lib.mkEnableOption "enables hardware drivers"; amdgpu.enable = lib.mkEnableOption "AMD specific drivers and microcode"; - stability = lib.mkOption { + kernel = lib.mkOption { type = lib.types.enum [ "stable" "unstable" + "zen" + "hardened" ]; default = "stable"; }; @@ -46,13 +48,21 @@ in }; }) - (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "unstable") { + (lib.mkIf (cfg.kernel == "unstable") { boot.kernelPackages = inputs.kernelv.legacyPackages.x86_64-linux.linuxPackages_6_17; }) - (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "stable") { + (lib.mkIf (cfg.kernel == "stable") { + boot.kernelPackages = pkgs.linuxPackages_latest; + }) + + (lib.mkIf (cfg.kernel == "zen") { boot.kernelPackages = pkgs.linuxPackages_zen; }) + + (lib.mkIf (cfg.kernel == "hardened") { + boot.kernelPackages = pkgs.linuxPackages_hardened; + }) ] ); } -- cgit v1.3