pass enabled down

hosts/algiz/default.nix

@@ -1,11 +1,9 @@
 {
   self,
   pkgs,
-  lib,
+  enabled,
   ...
-}: let
+}: {
-  inherit (lib) enabled;
-in {
   imports = with self.nixosModules; [
     restic
   ];

hosts/algiz/system.nix

@@ -1,6 +1,8 @@
-{lib, ...}: let
+{
-  inherit (lib) enabled;
+  lib,
-in {
+  enabled,
+  ...
+}: {
   users.motd = lib.mkRune {
     number = "6";
     rune = "algiz";

hosts/mannaz/default.nix

@@ -1,10 +1,8 @@
 {
   self,
-  lib,
+  enabled,
   ...
-}: let
+}: {
-  inherit (lib) enabled;
-in {
   imports = with self.nixosModules; [
     nix-ld
   ];

hosts/mannaz/system.nix

@@ -1,12 +1,11 @@
 {
   config,
   pkgs,
-  lib,
+  enabled,
+  mkRune,
   ...
-}: let
+}: {
-  inherit (lib) enabled;
+  users.motd = mkRune {
-in {
-  users.motd = lib.mkRune {
     number = "2";
     rune = "mannaz";
   };

hosts/othalan/default.nix

@@ -1,10 +1,8 @@
 {
   pkgs,
-  lib,
+  enabled,
   ...
-}: let
+}: {
-  inherit (lib) enabled;
-in {
   oizys = {
     desktop = enabled;
     hyprland = enabled;

hosts/othalan/system.nix

@@ -1,10 +1,9 @@
 {
   pkgs,
-  lib,
+  enabled,
+  mkRune,
   ...
-}: let
+}: {
-  inherit (lib) enabled;
-in {
   networking.networkmanager = enabled;
   services.printing = enabled;
   services.fwupd = enabled;
@@ -28,7 +27,7 @@ in {
     pamixer
   ];
 
-  services.getty.greetingLine = lib.mkRune {
+  services.getty.greetingLine = mkRune {
     rune = "othalan";
     runeKind = "ascii";
   };

lib/default.nix

@@ -3,7 +3,7 @@ inputs: let
   lib = nixpkgs.lib.extend (import ./extended.nix);
 
   inherit (builtins) mapAttrs readDir filter listToAttrs;
-  inherit (lib) nixosSystem genAttrs isNixFile mkDefaultOizysModule mkOizysModule;
+  inherit (lib) nixosSystem genAttrs isNixFile mkDefaultOizysModule mkOizysModule enabled mkRune;
   inherit (lib.filesystem) listFilesRecursive;
 
   inherit (import ./find-modules.nix {inherit lib;}) findModulesList;
@@ -26,7 +26,7 @@ in rec {
         isNixFile
         (listFilesRecursive (../. + "/hosts/${hostname}"));
 
-      specialArgs = {inherit inputs lib self mkDefaultOizysModule mkOizysModule;};
+      specialArgs = {inherit inputs lib self mkDefaultOizysModule mkOizysModule enabled mkRune;};
     };
 
   oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);

modules/desktop/window-managers/hyprland.nix

@@ -3,7 +3,7 @@
   pkgs,
   config,
   mkOizysModule,
-  lib,
+  enabled,
   ...
 }:
 # let
@@ -14,10 +14,10 @@
 #       swaylock -c 1e1e2e
 #     '';
 #   };
-let inherit (lib) enabled;
+mkOizysModule config "hyprland" {
-in
+  programs.hyprland =
-  mkOizysModule config "hyprland" {
+    enabled
-    programs.hyprland = enabled // {
+    // {
       package = inputs.hyprland.packages.${pkgs.system}.default;
     };
   security.pam.services.swaylock = {};
@@ -59,4 +59,4 @@ in
     # Must have been one of the other non-hyprland packages modified in the overlay
     # inputs.hyprland.overlays.default
   ];
-  }
+}

modules/programs/chrome/default.nix

@@ -22,7 +22,7 @@ mkOizysModule config "chrome" {
   };
 
   environment.systemPackages = with pkgs; [
-    (chromium.override{
+    (chromium.override {
       commandLineArgs = [
         "--force-dark-mode"
       ];