lib/default.nix

@@ -6,7 +6,7 @@
   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;
   inherit (lib.filesystem) listFilesRecursive;
 
   inherit (import ./find-modules.nix {inherit lib;}) findModulesList;
@@ -29,14 +29,16 @@ in rec {
         isNixFile
         (listFilesRecursive (../. + "/hosts/${hostname}"));
 
-      specialArgs = {inherit inputs lib self mkDefaultOizysModule mkOizysModule;};
+      specialArgs = {inherit inputs lib self;};
     };
 
   oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
   oizysPkg = forAllSystems (
-    pkgs: rec {
-      oizys = pkgs.callPackage ../oizys {};
-      default = oizys;
+    pkgs: let
+      pkg = pkgs.callPackage ../oizys {};
+    in {
+      oizys = pkg;
+      default = pkg;
     }
   );
   devShells = forAllSystems (

lib/extended.nix

@@ -1,5 +1,5 @@
 final: prev: let
-  inherit (final) hasSuffix mkEnableOption mkIf mkOption types;
+  inherit (final) hasSuffix mkEnableOption mkIf;
   runes = import ../modules/runes;
 in rec {
   enabled = {enable = true;};
@@ -33,12 +33,4 @@ in rec {
     options.oizys.${attr}.enable = mkEnableOption "enable ${attr} support";
     config = mkIf config.oizys.${attr}.enable content;
   };
-  mkDefaultOizysModule = config: attr: content: {
-    options.oizys.${attr}.enable = mkOption {
-      default = true;
-      description = "enable ${attr} support";
-      type = types.bool;
-    };
-    config = mkIf config.oizys.${attr}.enable content;
-  };
 }

modules/desktop/window-managers/hyprland.nix

@@ -2,9 +2,10 @@
   inputs,
   pkgs,
   config,
-  mkOizysModule,
+  lib,
   ...
 }: let
+  inherit (lib) mkOizysModule enabled;
   lock = pkgs.writeShellApplication {
     name = "lock";
     runtimeInputs = with pkgs; [swaylock];
@@ -14,7 +15,7 @@
   };
 in
   mkOizysModule config "hyprland" {
-    programs.hyprland.enable = true;
+    programs.hyprland = enabled;
     security.pam.services.swaylock = {};
     # Optional, hint electron apps to use wayland:
     environment.sessionVariables.NIXOS_OZONE_WL = "1";

modules/development/cli.nix

@@ -1,11 +1,20 @@
 {
   inputs,
+  lib,
   pkgs,
   config,
-  mkDefaultOizysModule,
   ...
-}:
-mkDefaultOizysModule config "cli" {
+}: let
+  inherit (lib) mkOption mkIf types;
+  cfg = config.oizys.cli;
+in {
+  options.oizys.cli.enable = mkOption {
+    default = true;
+    description = "Whether to enable cli.";
+    type = types.bool;
+  };
+
+  config = mkIf cfg.enable {
     programs.direnv.enable = true;
     environment.sessionVariables = {
       DIRENV_LOG_FORMAT = "direnv: %s";
@@ -26,4 +35,5 @@ mkDefaultOizysModule config "cli" {
       btop
       inputs.tsm.packages.${pkgs.system}.tsm
     ];
+  };
 }

modules/networking/vpn.nix

@@ -1,9 +1,11 @@
 {
   config,
+  lib,
   pkgs,
-  mkOizysModule,
   ...
-}:
-mkOizysModule config "vpn" {
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "vpn" {
     environment.systemPackages = [pkgs.openconnect];
-}
+  }

modules/programs/chrome/default.nix

@@ -1,10 +1,12 @@
 {
   pkgs,
   config,
-  mkOizysModule,
+  lib,
   ...
-}:
-mkOizysModule config "chrome" {
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "chrome" {
     programs.chromium = {
       enable = true;
 
@@ -25,4 +27,4 @@ mkOizysModule config "chrome" {
         ];
       })
     ];
-}
+  }

modules/storage/restic.nix

@@ -1,10 +1,12 @@
 {
   config,
   pkgs,
-  mkOizysModule,
+  lib,
   ...
-}:
-mkOizysModule config "backups" {
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "backups" {
     environment.systemPackages = with pkgs; [rclone];
 
     services.restic.backups.gdrive = {
@@ -32,4 +34,4 @@ mkOizysModule config "backups" {
         RandomizedDelaySec = "5h";
       };
     };
-}
+  }

modules/virtualization/docker.nix

@@ -1,12 +1,25 @@
 {
   pkgs,
   config,
-  mkOizysModule,
+  lib,
   ...
-}:
-mkOizysModule config "docker" {
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "docker" {
     virtualisation.docker.enable = true;
     environment.systemPackages = with pkgs; [
       lazydocker
     ];
-}
+  }
+# in {
+#   options.oizys.docker.enable = mkEnableOption "enable docker support";
+#
+#   config = mkIf cfg.enable {
+#     virtualisation.docker.enable = true;
+#     environment.systemPackages = with pkgs; [
+#       lazydocker
+#     ];
+#   };
+# }
+

modules/virtualization/virtualbox.nix

@@ -1,11 +1,13 @@
 {
   config,
-  mkOizysModule,
+  lib,
   ...
-}:
-mkOizysModule config "vbox" {
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "vbox" {
     virtualisation.virtualbox = {
       host.enable = true;
     };
     users.extraGroups.vboxusers.members = ["daylin"];
-}
+  }