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,29 +1,39 @@
 {
   inputs,
+  lib,
   pkgs,
   config,
-  mkDefaultOizysModule,
   ...
-}:
-mkDefaultOizysModule config "cli" {
-  programs.direnv.enable = true;
-  environment.sessionVariables = {
-    DIRENV_LOG_FORMAT = "direnv: %s";
+}: 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;
   };
 
-  environment.systemPackages = with pkgs; [
-    chezmoi
-    zoxide
-    lsd
-    fzf
+  config = mkIf cfg.enable {
+    programs.direnv.enable = true;
+    environment.sessionVariables = {
+      DIRENV_LOG_FORMAT = "direnv: %s";
+    };
 
-    # utils
-    fd
-    bat
-    delta
-    ripgrep
+    environment.systemPackages = with pkgs; [
+      chezmoi
+      zoxide
+      lsd
+      fzf
 
-    btop
-    inputs.tsm.packages.${pkgs.system}.tsm
-  ];
+      # utils
+      fd
+      bat
+      delta
+      ripgrep
+
+      btop
+      inputs.tsm.packages.${pkgs.system}.tsm
+    ];
+  };
 }

modules/networking/vpn.nix

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

modules/programs/chrome/default.nix

@@ -1,28 +1,30 @@
 {
   pkgs,
   config,
-  mkOizysModule,
+  lib,
   ...
-}:
-mkOizysModule config "chrome" {
-  programs.chromium = {
-    enable = true;
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "chrome" {
+    programs.chromium = {
+      enable = true;
 
-    extensions = [
-      "nngceckbapebfimnlniiiahkandclblb" # bitwarden
-      "gfbliohnnapiefjpjlpjnehglfpaknnc" # surfingkeys
-      "pbmlfaiicoikhdbjagjbglnbfcbcojpj" # simplify gmail
-      "oemmndcbldboiebfnladdacbdfmadadm" # pdf viewer
-      "clngdbkpkpeebahjckkjfobafhncgmne" # stylus
-      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
-    ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    (google-chrome.override {
-      commandLineArgs = [
-        "--force-dark-mode"
+      extensions = [
+        "nngceckbapebfimnlniiiahkandclblb" # bitwarden
+        "gfbliohnnapiefjpjlpjnehglfpaknnc" # surfingkeys
+        "pbmlfaiicoikhdbjagjbglnbfcbcojpj" # simplify gmail
+        "oemmndcbldboiebfnladdacbdfmadadm" # pdf viewer
+        "clngdbkpkpeebahjckkjfobafhncgmne" # stylus
+        "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
       ];
-    })
-  ];
-}
+    };
+
+    environment.systemPackages = with pkgs; [
+      (google-chrome.override {
+        commandLineArgs = [
+          "--force-dark-mode"
+        ];
+      })
+    ];
+  }

modules/storage/restic.nix

@@ -1,35 +1,37 @@
 {
   config,
   pkgs,
-  mkOizysModule,
+  lib,
   ...
-}:
-mkOizysModule config "backups" {
-  environment.systemPackages = with pkgs; [rclone];
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "backups" {
+    environment.systemPackages = with pkgs; [rclone];
 
-  services.restic.backups.gdrive = {
-    # BUG: if .conda/environments.txt doesn't exist then this won't work
-    # workaround for now `mkdir ~/.conda && touch ~/.conda/environments.txt`
+    services.restic.backups.gdrive = {
+      # BUG: if .conda/environments.txt doesn't exist then this won't work
+      # workaround for now `mkdir ~/.conda && touch ~/.conda/environments.txt`
 
-    extraBackupArgs = [
-      "--exclude-file /home/daylin/.config/restic/excludes.txt"
-      "--exclude-file /home/daylin/.conda/environments.txt"
-      "--verbose"
-      "--one-file-system"
-      "--tag systemd.timer"
-    ];
-    pruneOpts = [
-      "--verbose"
-      "--tag systemd.timer"
-      "--keep-daily 7"
-      "--keep-weekly 4"
-      "--keep-monthly 12"
-      "--keep-yearly 3"
-    ];
-    timerConfig = {
-      OnCalendar = "00:05";
-      Persistent = true;
-      RandomizedDelaySec = "5h";
+      extraBackupArgs = [
+        "--exclude-file /home/daylin/.config/restic/excludes.txt"
+        "--exclude-file /home/daylin/.conda/environments.txt"
+        "--verbose"
+        "--one-file-system"
+        "--tag systemd.timer"
+      ];
+      pruneOpts = [
+        "--verbose"
+        "--tag systemd.timer"
+        "--keep-daily 7"
+        "--keep-weekly 4"
+        "--keep-monthly 12"
+        "--keep-yearly 3"
+      ];
+      timerConfig = {
+        OnCalendar = "00:05";
+        Persistent = true;
+        RandomizedDelaySec = "5h";
+      };
     };
-  };
-}
+  }

modules/virtualization/docker.nix

@@ -1,12 +1,25 @@
 {
   pkgs,
   config,
-  mkOizysModule,
+  lib,
   ...
-}:
-mkOizysModule config "docker" {
-  virtualisation.docker.enable = true;
-  environment.systemPackages = with pkgs; [
-    lazydocker
-  ];
-}
+}: 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" {
-  virtualisation.virtualbox = {
-    host.enable = true;
-  };
-  users.extraGroups.vboxusers.members = ["daylin"];
-}
+}: let
+  inherit (lib) mkOizysModule;
+in
+  mkOizysModule config "vbox" {
+    virtualisation.virtualbox = {
+      host.enable = true;
+    };
+    users.extraGroups.vboxusers.members = ["daylin"];
+  }