let's do some inheritance shenanigans

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;
+  inherit (lib) nixosSystem genAttrs isNixFile mkDefaultOizysModule mkOizysModule;
   inherit (lib.filesystem) listFilesRecursive;
 
   inherit (import ./find-modules.nix {inherit lib;}) findModulesList;
@@ -29,7 +29,7 @@ in rec {
         isNixFile
         (listFilesRecursive (../. + "/hosts/${hostname}"));
 
-      specialArgs = {inherit inputs lib self;};
+      specialArgs = {inherit inputs lib self mkDefaultOizysModule mkOizysModule;};
     };
 
   oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);

modules/desktop/window-managers/hyprland.nix

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

modules/development/cli.nix

@@ -1,31 +1,29 @@
 {
   inputs,
-  lib,
   pkgs,
   config,
+  mkDefaultOizysModule,
   ...
-}: let
+}:
-  inherit (lib) mkDefaultOizysModule;
+mkDefaultOizysModule config "cli" {
-in
+  programs.direnv.enable = true;
-  mkDefaultOizysModule config "cli" {
+  environment.sessionVariables = {
-    programs.direnv.enable = true;
+    DIRENV_LOG_FORMAT = "direnv: %s";
-    environment.sessionVariables = {
+  };
-      DIRENV_LOG_FORMAT = "direnv: %s";
-    };
 
-    environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [
-      chezmoi
+    chezmoi
-      zoxide
+    zoxide
-      lsd
+    lsd
-      fzf
+    fzf
 
-      # utils
+    # utils
-      fd
+    fd
-      bat
+    bat
-      delta
+    delta
-      ripgrep
+    ripgrep
 
-      btop
+    btop
-      inputs.tsm.packages.${pkgs.system}.tsm
+    inputs.tsm.packages.${pkgs.system}.tsm
-    ];
+  ];
-  }
+}

modules/networking/vpn.nix

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

modules/programs/chrome/default.nix

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

modules/storage/restic.nix

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

modules/virtualization/docker.nix

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