reduce boilerplate with mkOizysModule

lib/extended.nix

@@ -1,5 +1,5 @@
 final: prev: let
-  inherit (final) hasSuffix;
+  inherit (final) hasSuffix mkEnableOption mkIf;
   runes = import ../modules/runes;
 in rec {
   enabled = {enable = true;};
@@ -28,4 +28,9 @@ in rec {
     runeKind ? "braille",
   }:
     "[1;3${number}m\n" + runes.${rune}.${runeKind} + "\n";
+
+  mkOizysModule = config: attr: content: {
+    options.oizys.${attr}.enable = mkEnableOption "enable ${attr} support";
+    config = mkIf config.oizys.${attr}.enable content;
+  };
 }

modules/desktop/fonts.nix

@@ -5,9 +5,8 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.oizys.desktop;
 in {
-  config = mkIf cfg.enable {
+  config = mkIf config.oizys.desktop.enable {
     fonts.fontconfig.enable = true;
     fonts.packages = with pkgs; [
       (nerdfonts.override {fonts = ["FiraCode"];})

modules/desktop/gui.nix

@@ -5,9 +5,8 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.oizys.desktop;
 in {
-  config = mkIf cfg.enable {
+  config = mkIf config.oizys.desktop.enable {
     environment.systemPackages = with pkgs; [
       wezterm
       alacritty

modules/desktop/window-managers/hyprland.nix

@@ -5,9 +5,7 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf;
+  inherit (lib) mkOizysModule;
-  cfg = config.programs.hyprland;
-
   lock = pkgs.writeShellApplication {
     name = "lock";
     runtimeInputs = with pkgs; [swaylock];
@@ -15,10 +13,8 @@
       swaylock -c 1e1e2e
     '';
   };
-in {
+in mkOizysModule config "hyprland" {
-  config = mkIf cfg.enable {
     security.pam.services.swaylock = {};
-    # programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.default;
     # Optional, hint electron apps to use wayland:
     environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
@@ -52,5 +48,4 @@ in {
       inputs.nixpkgs-wayland.overlay
       inputs.hyprland.overlays.default
     ];
-  };
+  }
-}

modules/editors/vscode.nix

@@ -5,9 +5,8 @@
   ...
 }: let
   inherit (lib) mkIf;
-  cfg = config.oizys.desktop;
 in {
-  config = mkIf cfg.enable {
+  config = mkIf config.oizys.desktop.enable {
     environment.systemPackages = with pkgs; [
       # vscode
       vscode-fhs

modules/networking/vpn.nix

@@ -4,14 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkOizysModule;
-  cfg = config.oizys.vpn;
+in mkOizysModule config "vpn" {
-in {
-  options.oizys.vpn.enable = mkEnableOption ''
-    Whether to enable openconnect for vpn connection.
-  '';
-
-  config = mkIf cfg.enable {
     environment.systemPackages = [pkgs.openconnect];
-  };
+  }
-}

modules/programs/chrome/default.nix

@@ -4,11 +4,8 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf mkEnableOption;
+  inherit (lib) mkOizysModule;
-  cfg = config.oizys.chrome;
+in mkOizysModule config "chrome" {
-in {
-  options.oizys.chrome.enable = mkEnableOption "enable chrome + extensions";
-  config = mkIf cfg.enable {
     programs.chromium = {
       enable = true;
 
@@ -29,5 +26,4 @@ in {
         ];
       })
     ];
-  };
+  }
-}

modules/storage/restic.nix

@@ -4,11 +4,9 @@
   lib,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkOizysModule;
-  cfg = config.oizys.backups;
+in 
-in {
+  mkOizysModule config "backups" {
-  options.oizys.backups.enable = mkEnableOption "enable restic/rclone backups";
-  config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [rclone];
 
     services.restic.backups.gdrive = {
@@ -36,5 +34,4 @@ in {
         RandomizedDelaySec = "5h";
       };
     };
-  };
+  }
-}

modules/virtualization/docker.nix

@@ -4,15 +4,22 @@
   lib,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkOizysModule;
-  cfg = config.oizys.docker;
+in
-in {
+  mkOizysModule config "docker" {
-  options.oizys.docker.enable = mkEnableOption "enable docker support";
-
-  config = mkIf cfg.enable {
     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

@@ -3,15 +3,11 @@
   lib,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkOizysModule;
-  cfg = config.oizys.vbox;
+in
-in {
+  mkOizysModule config "vbox" {
-  options.oizys.vbox.enable = mkEnableOption "enable virtualbox host";
-
-  config = mkIf cfg.enable {
     virtualisation.virtualbox = {
       host.enable = true;
     };
     users.extraGroups.vboxusers.members = ["daylin"];
-  };
+  }
-}