From 835e726c6c7e0233e766cd88d12c0cd5e992a562 Mon Sep 17 00:00:00 2001 From: tomoron Date: Sat, 25 Apr 2026 21:46:49 +0200 Subject: [PATCH] add exraflags option on Makefile, fix yubikey support on systemd stage 1 --- Makefile | 3 ++- homeConfigs/packages.nix | 2 +- osConfigs/global/boot.nix | 2 +- osConfigs/hosts/laptop.nix | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7f0d602..ecf5a81 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,8 @@ FLAKE ?= . MODE ?= switch -FLAGS = --impure --cores $(THREADS) -j $(THREADS) +EXTRAFLAGS ?= +FLAGS = --impure --cores $(THREADS) -j $(THREADS) $(EXTRAFLAGS) ifdef OFFLINE FLAGS += --option binary-caches '' diff --git a/homeConfigs/packages.nix b/homeConfigs/packages.nix index 2a67192..199d892 100644 --- a/homeConfigs/packages.nix +++ b/homeConfigs/packages.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/02/09 22:01:56 by tomoron #+# #+# # -# Updated: 2026/03/27 12:00:06 by tomoron ### ########.fr # +# Updated: 2026/04/25 20:35:24 by tomoron ### ########.fr # # # # **************************************************************************** # diff --git a/osConfigs/global/boot.nix b/osConfigs/global/boot.nix index e977f52..de79e6d 100644 --- a/osConfigs/global/boot.nix +++ b/osConfigs/global/boot.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/09/05 23:37:58 by tomoron #+# #+# # -# Updated: 2026/04/03 11:46:09 by tomoron ### ########.fr # +# Updated: 2026/04/25 21:44:28 by tomoron ### ########.fr # # # # **************************************************************************** # diff --git a/osConfigs/hosts/laptop.nix b/osConfigs/hosts/laptop.nix index e09ef46..46250e5 100644 --- a/osConfigs/hosts/laptop.nix +++ b/osConfigs/hosts/laptop.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/09/06 00:56:57 by tomoron #+# #+# # -# Updated: 2026/04/18 19:04:59 by tomoron ### ########.fr # +# Updated: 2026/04/25 21:44:25 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -15,6 +15,7 @@ { services.udev.packages = [ pkgs.yubikey-personalization ]; boot.initrd.kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; + boot.initrd.systemd.enable = false; boot.initrd.luks.yubikeySupport = true; boot.initrd.luks.devices.cryptroot = { device = "/dev/disk/by-uuid/a4593b01-069d-4a5d-a550-74a762b89b3f"; @@ -34,6 +35,7 @@ boot.blacklistedKernelModules = [ "nvidia" "nvidia_drm" "nvidia_uvm" ]; #speeds up startup programs.droidcam.enable = true; + mods.displayManager.enable = true; mods.yubikey.pam.enable = true; networking.firewall.enable = false;