diff --git a/system_profiles/components/home-manager.nix b/system_profiles/components/home-manager.nix
index 42eeaba..5b6500e 100644
--- a/system_profiles/components/home-manager.nix
+++ b/system_profiles/components/home-manager.nix
@@ -1,10 +1,10 @@
-{inArgs, pkgs, ...}: {
+{inArgs, pkgs, lib, ...}: {
   imports = [ inArgs.home-manager.nixosModules.home-manager ];
 
   environment.systemPackages = [ pkgs.home-manager ];
 
   home-manager = {
-    useUserPackages = true;
-    useGlobalPkgs = true;
+    useUserPackages = lib.mkDefault true;
+    useGlobalPkgs = lib.mkDefault true;
   };
 }
diff --git a/system_profiles/components/nix-defaults.nix b/system_profiles/components/nix-defaults.nix
index 157ced6..c0eb3f3 100644
--- a/system_profiles/components/nix-defaults.nix
+++ b/system_profiles/components/nix-defaults.nix
@@ -1,6 +1,6 @@
 # This loads some nix and nixpkgs specific settints
 # i often need
-{lib, pkgs, ...}: {
+{lib, ...}: {
   # Disable if you don't want unfree packages
   nixpkgs.config.allowUnfree = lib.mkDefault true;
 
diff --git a/system_profiles/components/nixpkgs-ng.nix b/system_profiles/components/nixpkgs-ng.nix
index 4321bdd..9950e12 100644
--- a/system_profiles/components/nixpkgs-ng.nix
+++ b/system_profiles/components/nixpkgs-ng.nix
@@ -1,5 +1,5 @@
-{
+{lib, ...}: {
   system = {
-    rebuild.enableNg = false;
+    rebuild.enableNg = lib.mkDefault false;
   };
 }
diff --git a/system_profiles/components/no-x.nix b/system_profiles/components/no-x.nix
index 6ed1892..f0c491b 100644
--- a/system_profiles/components/no-x.nix
+++ b/system_profiles/components/no-x.nix
@@ -1,9 +1,9 @@
-{
+{lib, ...}: {
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = false;
+  services.xserver.enable = lib.mkDefault false;
 
   # force chromium and electron apps to use wayland
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+  environment.sessionVariables.NIXOS_OZONE_WL = lib.mkDefault "1";
 }
 
diff --git a/system_profiles/components/qemu.nix b/system_profiles/components/qemu.nix
index 4a14da3..2ed31c6 100644
--- a/system_profiles/components/qemu.nix
+++ b/system_profiles/components/qemu.nix
@@ -1,6 +1,6 @@
-{modulesPath, ...}: {
+{modulesPath, lib, ...}: {
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
-  services.qemuGuest.enable = true;
+  services.qemuGuest.enable = lib.mkDefault true;
 }
diff --git a/system_profiles/components/serial-console.nix b/system_profiles/components/serial-console.nix
index 521887f..9bc085c 100644
--- a/system_profiles/components/serial-console.nix
+++ b/system_profiles/components/serial-console.nix
@@ -1,6 +1,6 @@
-{
+{lib, ...}: {
   boot.kernelParams = [ "console=ttyS0,115200n8" ];
-  boot.loader.grub.extraConfig = "
+  boot.loader.grub.extraConfig = lib.mkDefault "
     serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
     terminal_input serial
     terminal_output serial