Changed the traces to specify wether it's a home-manager trace, or a …

…system rebuild trace.

modules/common/boot/default.nix

@@ -1,6 +1,6 @@
 ## Defines all the settings for boot.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./loader ];
 

modules/common/boot/loader/default.nix

@@ -1,6 +1,6 @@
 ## Defines all the settings for the boot loader.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./efi ./grub ./systemd-boot ];
 

modules/common/boot/loader/efi/default.nix

@@ -1,6 +1,6 @@
 ## Defines all the settings for the boot loader.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     boot.loader.efi = {
         canTouchEfiVariables = (lib.mkDefault true);

modules/common/boot/loader/grub/default.nix

@@ -1,6 +1,6 @@
 ## Defines all the settings for the grub boot loader.
 #! Cannot be enabled if systemd-boot is enabled.
-arguments @ { config, pkgs, lib, machine-settings, ... } : (builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : (builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     boot.loader.grub = let 
 

modules/common/boot/loader/systemd-boot/default.nix

@@ -1,6 +1,6 @@
 ## Defines all the settings for the boot loader.
 #! Cannot be enabled if grub is enabled.
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     boot.loader.systemd-boot = {
         enable = (lib.mkDefault false);

modules/common/default.nix

@@ -1,6 +1,6 @@
 ## impors all the modules in this directory.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ 
         ./boot

modules/common/environment/default.nix

@@ -1,6 +1,6 @@
 ## Defines environment settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./systemPackages ]; 
 

modules/common/environment/systemPackages/default.nix

@@ -1,6 +1,6 @@
 ## Defines the packages to use on the system.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
   environment.systemPackages = with pkgs; [
 

modules/common/fonts/default.nix

@@ -1,6 +1,6 @@
 ## Add fonts to the system.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     fonts.packages = with pkgs; [
         open-dyslexic

modules/common/hardware/default.nix

@@ -1,6 +1,6 @@
 ## Defines miscellaneous settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./pulseaudio  ]; 
 

modules/common/hardware/pulseaudio/default.nix

@@ -1,6 +1,6 @@
 ## Defines miscellaneous settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     hardware.pulseaudio = {
         enable = (lib.mkDefault false);

modules/common/i18n/default.nix

@@ -1,6 +1,6 @@
 ## Defines internationalisation settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./extraLocaleSettings ];
 

modules/common/i18n/extraLocaleSettings/default.nix

@@ -1,6 +1,6 @@
 ## Defines all the settings for boot.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     i18n.extraLocaleSettings = let dutch = "nl_NL.UTF-8"; in {
         LC_ADDRESS        = (lib.mkDefault dutch);

modules/common/networking/default.nix

@@ -1,6 +1,6 @@
 ## Defines the networking options.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./firewall ./networkmanager ./proxy ./wireless ]; 
 

modules/common/networking/firewall/default.nix

@@ -1,6 +1,6 @@
 ## Defines the networking options.
 #! Warning editing this will edit it for all hosts. Not just for one machine.
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     networking.firewall = {
         enable          = lib.mkDefault true;   # Are you sure? Did you read the top #!comment !?

modules/common/networking/networkmanager/default.nix

@@ -1,6 +1,6 @@
 ## Defines the network manager options.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     networking.networkmanager = {
         enable = (lib.mkDefault true);

modules/common/networking/proxy/default.nix

@@ -1,6 +1,6 @@
 ## Defines the networking proxy options.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     networking.proxy  = {
         # default = (lib.mkDefault "http://user:password@proxy:port/");

modules/common/networking/wireless/default.nix

@@ -1,6 +1,6 @@
 ## Defines the networking options.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     networking.wireless = {
         #// enable = (lib.mkDefault true);

modules/common/nix/default.nix

@@ -1,6 +1,6 @@
 ## Defines nix settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./settings ./gc ];
 

modules/common/nix/gc/default.nix

@@ -1,6 +1,6 @@
 ## Defines nix garbage collection settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     nix.gc = {
         automatic = (lib.mkDefault true);

modules/common/nix/settings/default.nix

@@ -1,6 +1,6 @@
 ## Defines nix settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./experimental-features ];
 })

modules/common/nix/settings/experimental-features/default.nix

@@ -1,6 +1,6 @@
 ## Defines nix settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     nix.settings.experimental-features = lib.mkForce [
         "nix-command"  #? unknown 

modules/common/nixpkgs/config/default.nix

@@ -1,6 +1,6 @@
 ## Defines Nix packages configuration settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     nixpkgs.config = {
         allowUnfree = (lib.mkDefault machine-settings.system.packages.allowUnfree);

modules/common/nixpkgs/default.nix

@@ -1,6 +1,6 @@
 ## Defines Nix packages configuration settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./config ]; 
 

modules/common/security/default.nix

@@ -1,6 +1,6 @@
 ## Defines display manager / window manager settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./rtkit ./sudo ]; 
 

modules/common/security/rtkit/default.nix

@@ -1,6 +1,6 @@
 ## Defines display manager / window manager settings.
 #? unknown setting, but was here when I booted.
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     security.rtkit = {
         enable = lib.mkDefault true;

modules/common/security/sudo/default.nix

@@ -1,6 +1,6 @@
 ## Defines display manager / window manager settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     security.sudo = {
         wheelNeedsPassword = lib.mkDefault false;

modules/common/services/default.nix

@@ -1,6 +1,6 @@
 ## Defines the services that run on the system.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./libinput ./logind ./pipewire ./printing ./tailscale ]; 
 

modules/common/services/libinput/default.nix

@@ -1,6 +1,6 @@
 ## Defines the services that run on the system.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     services.libinput = {
         touchpad.naturalScrolling = true;

modules/common/services/logind/default.nix

@@ -1,6 +1,6 @@
 ## Defines the services that run on the system.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     services.logind = let 
 

modules/common/services/pipewire/default.nix

@@ -1,6 +1,6 @@
 ## Defines the pipewire service.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     services.pipewire = {
         enable            = true;

modules/common/services/printing/default.nix

@@ -1,6 +1,6 @@
 ## Defines the printing service that runs on the system.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     services.printing = {
         enable = true;

modules/common/services/tailscale/default.nix

@@ -1,6 +1,6 @@
 ## Defines the tailscale service.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     services.tailscale = {
         enable = true;

modules/common/sops/default.nix

@@ -1,6 +1,6 @@
 ## configures SOBS which is a secret management tool
 
-arguments @ { config, pkgs, lib, machine-settings, input, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, input, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
   imports = [ 
     (import input."tygo-van-den-hurk-secrets" arguments)

modules/common/sound/default.nix

@@ -1,6 +1,6 @@
 ## Defines miscellaneous settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     sound = {
         enable = lib.mkDefault true;

modules/common/system/autoUpgrade/default.nix

@@ -1,6 +1,6 @@
 ## Defines the systems auto upgrade settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     system.autoUpgrade = { 
         enable = lib.mkDefault true;

modules/common/system/default.nix

@@ -1,6 +1,6 @@
 ## Defines the system settings.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     system = {
         # This value determines the NixOS release from which the default

modules/common/time/default.nix

@@ -1,6 +1,6 @@
 ## Defines the settings for the timezone.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     time = {
         timeZone = lib.mkDefault "Europe/Amsterdam";

modules/common/users/default.nix

@@ -1,6 +1,6 @@
 ## Defines the user options.
 
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [ ./extraUsers ]; 
 

modules/common/users/extraUsers/default.nix

@@ -1,5 +1,5 @@
 ## Defines the user options.
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     # TODO : make all the users get printed to the console
     users.extraUsers = ( lib.attrsets.concatMapAttrs (__username_: __usersettings_:  

modules/default.nix

@@ -1,6 +1,6 @@
 ## imports all the modules in this directory as specified by the machine-settings.
 #! breaking this file could break multiple systems. Only remove modules if you are sure they are unused by all systems.
-arguments @ { config, pkgs, lib, machine-settings, input, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, input, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
   imports = [ 
     ./system-level
     ./user-level

modules/system-level/default.nix

@@ -1,6 +1,6 @@
 ## imports all the system level modules in this directory as specified by the machine-settings.
 #! breaking this file could break multiple systems. Only remove modules if you are sure they are unused by all systems.
-arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "Loading: ${toString ./.}..." { 
+arguments @ { config, pkgs, lib, machine-settings, ... } : ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [
         ./gaming 

modules/system-level/gaming/default.nix

@@ -4,7 +4,7 @@ arguments @ { config, pkgs, lib, machine-settings, ... } : let
 
     module-settings = machine-settings.system.modules.gaming;
 
-in ( if module-settings.enable == true then builtins.trace "Loading: ${toString ./.}..." {
+in ( if module-settings.enable == true then builtins.trace "(System) Loading: ${toString ./.}..." {
 
     programs.gamemode.enable = (lib.mkDefault true);
 

modules/system-level/gpg/default.nix

@@ -4,7 +4,7 @@ arguments @ { config, pkgs, lib, machine-settings, ... } : let
 
     module-settings = machine-settings.system.modules.gpg;
 
-in ( if module-settings.enable == true then builtins.trace "Loading: ${toString ./.}..." {
+in ( if module-settings.enable == true then builtins.trace "(System) Loading: ${toString ./.}..." {
 
     programs.gnupg = {
         package = (lib.mkDefault pkgs.gnupg);

modules/system-level/gui/default.nix

@@ -27,7 +27,7 @@ in ( if ( amount-of-GUIs-enabled > 1 ) then (
         list-enabled-GUIs-string = ("Enabled GUIs:${enabled-GUIs-string}\nYou can only pick one GUI.");
     in abort ( "More then 1 GUI was selected." + list-enabled-GUIs-string)
 
-) else if ( amount-of-GUIs-enabled > 0 ) then ( builtins.trace "Loading: ${toString ./.}..." { 
+) else if ( amount-of-GUIs-enabled > 0 ) then ( builtins.trace "(System) Loading: ${toString ./.}..." { 
 
     imports = [
         ./i3wm

modules/system-level/gui/gnome/default.nix

@@ -4,7 +4,7 @@ arguments @ { config, pkgs, lib, machine-settings, ... } : let
 
     this-module-is-enabled = machine-settings.system.modules.gui.gnome.enable;
 
-in ( if ( this-module-is-enabled == true ) then (builtins.trace "Loading: ${toString ./.}..." {
+in ( if ( this-module-is-enabled == true ) then (builtins.trace "(System) Loading: ${toString ./.}..." {
 
     #| required settings
     services.xserver.enable                      = lib.mkDefault true;

modules/system-level/gui/hyprland/default.nix

@@ -4,7 +4,7 @@ arguments @ { config, pkgs, lib, machine-settings, programs, ... } : let
 
     module-settings = machine-settings.system.modules.gui.hyprland;
 
-in ( if ( module-settings.enable == true ) then ( builtins.trace "Loading: ${toString ./.}..." {
+in ( if ( module-settings.enable == true ) then ( builtins.trace "(System) Loading: ${toString ./.}..." {
 
     imports = [ ./nvidia-patches.nix ./extra-packages.nix ];
 

modules/system-level/gui/hyprland/extra-packages.nix

@@ -12,7 +12,7 @@ arguments @ { config, pkgs, lib, ... } : let
     notifications-providers = with pkgs; [ dunst libnotify                                           ];
     hyprland-extentions     = with pkgs; [ eww updated-waybar                                        ];
 
-in ( builtins.trace "Loading: ${toString ./.} (extra packages)..." {
+in ( builtins.trace "(System) Loading: ${toString ./.} (extra packages)..." {
 
     environment.systemPackages = ( 
         hyprland-basis 

modules/system-level/gui/hyprland/nvidia-patches.nix

@@ -2,7 +2,7 @@ arguments @ { config, pkgs, lib, machine-settings, programs, ... } : let
 
     nvidia-is-enabled = machine-settings.system.module.nvidia.enable;
 
-in ( if ( nvidia-is-enabled == true ) then (builtins.trace "Loading: ${toString ./.} (NVIDIA patches)..." {
+in ( if ( nvidia-is-enabled == true ) then (builtins.trace "(System) Loading: ${toString ./.} (NVIDIA patches)..." {
 
     services.xserver.videoDrivers = [ "nvidia" ];
     programs.hyprland.enableNvidiaPatches = lib.mkDefault true;