refactor: updated all modules to not use global with syntax for lib and lib.${namespace}

homes/aarch64-linux/c4patino@chibi/default.nix

@@ -2,9 +2,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; {
+}: let
+  inherit (lib.${namespace}) enabled;
+in {
   ${namespace} = {
     bundles = {
       common = enabled;

homes/x86_64-linux/c4patino@arisu/default.nix

@@ -2,9 +2,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; {
+}: let
+  inherit (lib.${namespace}) enabled;
+in {
   imports = [./stylix.nix];
 
   ${namespace} = {

homes/x86_64-linux/c4patino@kokoro/default.nix

@@ -2,9 +2,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; {
+}: let
+  inherit (lib.${namespace}) enabled;
+in {
   imports = [./stylix.nix];
 
   ${namespace} = {

homes/x86_64-linux/c4patino@shiori/default.nix

@@ -2,9 +2,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; {
+}: let
+  inherit (lib.${namespace}) enabled;
+in {
   ${namespace} = {
     bundles = {
       common = enabled;

lib/module/default.nix

@@ -168,7 +168,6 @@ with lib; rec {
   ## @param pathStr   dot-separated list for the nested attribute to retrieve
   ## @param attrs     attribute list for getting the keys
   ## @return          attribute value if found; otherwise null
-
   getIn = pathStr: attrs: let
     path = splitString "." pathStr;
     go = attrs: p:

modules/home/bundles/common/default.nix

@@ -6,16 +6,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.bundles.common";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "common bundle";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "common bundle";
+  };
 
   config = mkIf cfg.enable {
     ${namespace} = {

modules/home/bundles/desktop/applications/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.bundles.desktop.applications";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "desktop application bundle";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "desktop application bundle";
+  };
 
   config = mkIf cfg.enable {
     ${namespace} = {

modules/home/bundles/desktop/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.bundles.desktop";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "desktop environment bundle";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "desktop environment bundle";
+  };
 
   config = mkIf cfg.enable {
     ${namespace} = {

modules/home/bundles/development/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.bundles.development";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "development bundle";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "development bundle";
+  };
 
   config = mkIf cfg.enable {
     ${namespace} = {

modules/home/bundles/shell/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.bundles.shell";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "shell utility bundle";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "shell utility bundle";
+  };
 
   config = mkIf cfg.enable {
     ${namespace} = {

modules/home/cli/access/crypt/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.access.crypt";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "git-crypt";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "git-crypt";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [git-crypt];

modules/home/cli/access/lastpass/lastpass.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.access.lastpass";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "lastpass-cli";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "lastpass-cli";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [lastpass-cli];

modules/home/cli/access/sops/default.nix

@@ -5,9 +5,9 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.access.sops";
   cfg = getAttrByNamespace config base;
 in {
@@ -15,10 +15,9 @@ in {
     inputs.sops-nix.homeManagerModules.sops
   ];
 
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "sops-nix";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "sops-nix";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [sops];

modules/home/cli/access/ssh/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.access.ssh";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "ssh";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "ssh";
+  };
 
   config = mkIf cfg.enable {
     programs.ssh = {

modules/home/cli/dev/direnv/default.nix

@@ -4,16 +4,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.dev.direnv";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "direnv";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "direnv";
+  };
 
   config = mkIf cfg.enable {
     programs.direnv = {

modules/home/cli/dev/git/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.cli.dev.git";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "git";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "git";
+  };
 
   config = mkIf cfg.enable {
     programs.git = {

modules/home/cli/dev/lazygit/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.dev.lazygit";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "lazygit";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "lazygit";
+  };
 
   config = mkIf cfg.enable {
     programs.lazygit.enable = true;

modules/home/cli/dev/leetcode/default.nix

@@ -5,16 +5,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.dev.leetcode";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "leetcode";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "leetcode";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/cli/dev/neovim/default.nix

@@ -5,16 +5,15 @@
   namespace,
   system,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.dev.neovim";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "neovim";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "neovim";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/cli/dev/zoxide/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.dev.zoxide";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "zoxide";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "zoxide";
+  };
 
   config = mkIf cfg.enable {
     programs.zoxide = {

modules/home/cli/dev/zsh/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.dev.zsh";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "zsh";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "zsh";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/cli/media/bat/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.media.bat";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "bat";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "bat";
+  };
 
   config = mkIf cfg.enable {
     programs.bat = {

modules/home/cli/media/cava/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.media.cava";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "cava";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "cava";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [cava];

modules/home/cli/media/grim/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.media.grim";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "grim";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "grim";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [grim];

modules/home/cli/media/pandoc/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.media.pandoc";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "pandoc";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "pandoc";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [pandoc];

modules/home/cli/media/slurp/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.media.slurp";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "grim";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "grim";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [slurp];

modules/home/cli/media/spotify/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.media.spotify";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "spotify";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "spotify";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [spotify-player];

modules/home/cli/media/yazi/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.cli.media.yazi";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "yazi";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "yazi";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [

modules/home/cli/metrics/btm/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.metrics.btm";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "btm";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "btm";
+  };
 
   config = mkIf cfg.enable {
     programs.bottom = {

modules/home/cli/metrics/hyperfine/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.metrics.hyperfine";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "hyperfine";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "hyperfine";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [hyperfine];

modules/home/cli/metrics/nvtop/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.metrics.nvtop";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "nvtop";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "nvtop";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [nvtopPackages.nvidia];

modules/home/cli/scripts/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.cli.scripts";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "custom shell scripts";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "custom shell scripts";
+  };
 
   config = mkIf cfg.enable {
     home.packages = [

modules/home/desktop/apps/browsers/vivaldi/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.browsers.vivaldi";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Vivaldi";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Vivaldi";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [vivaldi];

modules/home/desktop/apps/editors/jetbrains/android-studio/android-studio.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.editors.jetbrains.android-studio";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Android Studio";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Android Studio";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/apps/editors/jetbrains/clion/clion.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.editors.jetbrains.clion";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "CLion";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "CLion";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/apps/editors/jetbrains/idea/idea.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.editors.jetbrains.idea";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Idea";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Idea";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/apps/editors/jetbrains/pycharm/pycharm.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.editors.jetbrains.pycharm";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "PyCharm";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "PyCharm";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/apps/editors/jetbrains/rider/rider.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.editors.jetbrains.rider";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Rider";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Rider";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/apps/editors/vscode/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.desktop.apps.editors.vscode";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "VSCode";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "VSCode";
+  };
 
   config = mkIf cfg.enable {
     programs.vscode = enabled;

modules/home/desktop/apps/games/prismlauncher/default.nix

@@ -2,17 +2,17 @@
   config,
   lib,
   namespace,
+  pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.games.prismlauncher";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "PrismLauncher";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "PrismLauncher";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [prismlauncher];

modules/home/desktop/apps/launchers/anyrun/default.nix

@@ -6,9 +6,9 @@
   pkgs,
   system,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption getExe;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.launchers.anyrun";
   cfg = getAttrByNamespace config base;
 
@@ -17,10 +17,9 @@ with lib.${namespace}; let
     ${getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css
   ''}/${name}.css";
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Anyrun";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Anyrun";
+  };
 
   config = mkIf cfg.enable {
     programs.anyrun = {

modules/home/desktop/apps/media/fiji/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.media.fiji";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Fiji";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Fiji";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/apps/media/libreoffice/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.media.libreoffice";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "LibreOffice";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "LibreOffice";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [

modules/home/desktop/apps/media/obsidian/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.media.obsidian";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Obsidian";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Obsidian";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [obsidian];

modules/home/desktop/apps/media/spotify/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.media.spotify";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Spotify";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Spotify";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [spotify];

modules/home/desktop/apps/media/zathura/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.media.zathura";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Zathura";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Zathura";
+  };
 
   config = mkIf cfg.enable {
     programs.zathura = {

modules/home/desktop/apps/media/zotero/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.media.zotero";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Zotero";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Zotero";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [zotero];

modules/home/desktop/apps/sms/discord/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.sms.discord";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Discord";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Discord";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [webcord-vencord];

modules/home/desktop/apps/sms/slack/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.sms.slack";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Slack";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Slack";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [slack];

modules/home/desktop/apps/sms/zoom/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.sms.zoom";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Zoom";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Zoom";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [zoom-us];

modules/home/desktop/apps/terminals/kitty/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.terminals.kitty";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Kitty";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Kitty";
+  };
 
   config = {
     home.packages = with pkgs; [kitty.terminfo];

modules/home/desktop/apps/tools/mongodb-compass/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.tools.mongodb-compass";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "MongoDB Compass";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "MongoDB Compass";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [mongodb-compass];

modules/home/desktop/apps/tools/obs/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.tools.obs";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "OBS Studio";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "OBS Studio";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [obs-studio];

modules/home/desktop/apps/tools/postman/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.tools.postman";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Postman";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Postman";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [postman];

modules/home/desktop/env/eww/default.nix

@@ -5,16 +5,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.env.eww";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "eww";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "eww";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/env/gtk/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.env.gtk";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "gtk";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "gtk";
+  };
 
   config = mkIf cfg.enable {
     qt = {

modules/home/desktop/env/gtk/gtk.nix

@@ -1,24 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkIf;
-  cfg = config.hyprland;
-in {
-  config = mkIf cfg.enable {
-    qt = {
-      enable = true;
-      platformTheme.name = "gtk";
-    };
-
-    gtk = {
-      enable = true;
-      theme = {
-        package = pkgs.adw-gtk3;
-        name = "adw-gtk3";
-      };
-    };
-  };
-}

modules/home/desktop/env/hyprland/default.nix

@@ -4,9 +4,9 @@
   namespace,
   pkgs,
   ...
-} @ args:
-with lib;
-with lib.${namespace}; let
+} @ args: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.env.hyprland";
   cfg = getAttrByNamespace config base;
 in {
@@ -16,10 +16,9 @@ in {
     (import ./rules.nix args)
   ];
 
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Hyprland";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Hyprland";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [hyprpicker hyprpaper];

modules/home/desktop/env/hyprland/general.nix

@@ -4,9 +4,9 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) getAttrByNamespace;
   base = "${namespace}.desktop.env.hyprland";
   cfg = getAttrByNamespace config base;
 in {

modules/home/desktop/env/hyprland/keybinds.nix

@@ -3,9 +3,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) getAttrByNamespace;
   base = "${namespace}.desktop.env.hyprland";
   cfg = getAttrByNamespace config base;
 in {

modules/home/desktop/env/hyprland/rules.nix

@@ -3,9 +3,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) getAttrByNamespace;
   base = "${namespace}.desktop.env.hyprland";
   cfg = getAttrByNamespace config base;
 in {

modules/home/desktop/services/hyprpaper/default.nix

@@ -5,9 +5,9 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.services.hyprpaper";
   cfg = getAttrByNamespace config base;
 
@@ -23,10 +23,9 @@ with lib.${namespace}; let
     ${pkgs.hyprland}/bin/hyprctl hyprpaper reload ,"$WALLPAPER"
   '';
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "hyprpaper";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "hyprpaper";
+  };
 
   config = mkIf cfg.enable {
     services.hyprpaper = {

modules/home/desktop/services/mako/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.services.mako";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Mako";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Mako";
+  };
 
   config = mkIf cfg.enable {
     services.mako = {

modules/home/desktop/services/variety/default.nix

@@ -5,16 +5,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.services.variety";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "variety";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "variety";
+  };
 
   config = mkIf cfg.enable {
     home = {

modules/home/desktop/services/wl-clipboard/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.services.wl-clipboard";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "wl-clipboard";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "wl-clipboard";
+  };
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [

modules/nixos/bundles/common/default.nix

@@ -4,9 +4,9 @@
   namespace,
   pkgs,
   ...
-} @ args:
-with lib;
-with lib.${namespace}; let
+} @ args: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.bundles.common";
   cfg = getAttrByNamespace config base;
 in {
@@ -15,10 +15,9 @@ in {
     (import ./users.nix args)
   ];
 
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "common bundle";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "common bundle";
+  };
 
   config = mkIf cfg.enable {
     ${namespace} = {

modules/nixos/bundles/common/networking.nix

@@ -3,9 +3,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) getAttrByNamespace;
   base = "${namespace}.bundles.common";
   cfg = getAttrByNamespace config base;
 in {

modules/nixos/bundles/common/users.nix

@@ -8,6 +8,8 @@
 }:
 with lib;
 with lib.${namespace}; let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) getAttrByNamespace;
   inherit (config.networking) hostName;
   base = "${namespace}.bundles.common";
   cfg = getAttrByNamespace config base;

modules/nixos/bundles/desktop/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.bundles.desktop";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "desktop environment bundle";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "desktop environment bundle";
+  };
 
   config = mkIf cfg.enable {
     ${namespace} = {

modules/nixos/desktop/apps/games/minecraft/default.nix

@@ -3,10 +3,11 @@
   inputs,
   lib,
   namespace,
+  pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) types mkIf mkEnableOption mkOption mapAttrs mapAttrsToList flatten;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.games.minecraft";
   cfg = getAttrByNamespace config base;
 in {

modules/nixos/desktop/apps/games/steam/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.apps.games.steam";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Steam";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Steam";
+  };
 
   config = mkIf cfg.enable {
     programs.steam = {

modules/nixos/desktop/apps/teamviewer/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace enabled;
   base = "${namespace}.desktop.apps.teamviewer";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Teamviewer";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Teamviewer";
+  };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [teamviewer];

modules/nixos/desktop/env/gdm/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.env.gdm";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "gdm";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "gdm";
+  };
 
   config = mkIf cfg.enable {
     services.xserver.displayManager.gdm = {

modules/nixos/desktop/env/hyprland/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.env.hyprland";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "hyprland";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "hyprland";
+  };
 
   config = mkIf cfg.enable {
     programs.hyprland = {

modules/nixos/desktop/env/x11/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.desktop.env.x11";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "X11";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "X11";
+  };
 
   config = mkIf cfg.enable {
     services.xserver = {

modules/nixos/hardware/audio/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.hardware.audio";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "audio";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "audio";
+  };
 
   config = mkIf cfg.enable {
     security.rtkit.enable = true;

modules/nixos/hardware/battery/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.hardware.battery";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "battery";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "battery";
+  };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [acpi];

modules/nixos/hardware/bluetooth/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.hardware.bluetooth";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "bluetooth";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "bluetooth";
+  };
 
   config = mkIf cfg.enable {
     services.blueman.enable = true;

modules/nixos/hardware/bootloader/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.hardware.bootloader";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "bootloader";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "bootloader";
+  };
 
   config = mkIf cfg.enable {
     boot.loader.grub = {

modules/nixos/hardware/nvidia/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.hardware.nvidia";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "nvidia";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "nvidia";
+  };
 
   config = mkIf cfg.enable {
     hardware.graphics = {

modules/nixos/hardware/printing/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.hardware.printing";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "printing";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "printing";
+  };
 
   config = mkIf cfg.enable {
     services.printing.enable = true;

modules/nixos/hardware/xremap/default.nix

@@ -4,9 +4,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.hardware.xremap";
   cfg = getAttrByNamespace config base;
 in {
@@ -14,10 +14,9 @@ in {
     inputs.xremap.nixosModules.default
   ];
 
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "xremap";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "xremap";
+  };
 
   config = {
     services.xremap = {

modules/nixos/services/apps/forgejo/default.nix

@@ -4,9 +4,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption filterAttrs attrNames head mkForce;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace resolveHostIP readJsonOrEmpty getIn;
   inherit (config.networking) hostName;
   base = "${namespace}.services.apps.forgejo";
   cfg = getAttrByNamespace config base;
@@ -21,10 +21,9 @@ with lib.${namespace}; let
 
   port = 5300;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "forgejo";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "forgejo";
+  };
 
   config = mkIf cfg.enable {
     services.forgejo = {

modules/nixos/services/apps/glance/default.nix

@@ -3,9 +3,9 @@
   lib,
   namespace,
   ...
-} @ args:
-with lib;
-with lib.${namespace}; let
+} @ args: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.services.apps.glance";
   cfg = getAttrByNamespace config base;
 
@@ -15,10 +15,9 @@ in {
     (import ./layout.nix args)
   ];
 
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "glance";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "glance";
+  };
 
   config = mkIf cfg.enable {
     services.glance = {

modules/nixos/services/apps/rustypaste/default.nix

@@ -5,19 +5,18 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.services.apps.rustypaste";
   cfg = getAttrByNamespace config base;
   userCfg = config.users.users;
 
   port = 5100;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "rustypaste";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "rustypaste";
+  };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [rustypaste-cli];

modules/nixos/services/apps/vaultwarden/default.nix

@@ -5,9 +5,9 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption filterAttrs attrNames head elem;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace readJsonOrEmpty getIn resolveHostIP;
   base = "${namespace}.services.apps.vaultwarden";
   cfg = getAttrByNamespace config base;
   pgCfg = getAttrByNamespace config "${namespace}.services.storage.postgresql";
@@ -15,10 +15,9 @@ with lib.${namespace}; let
 
   port = 5400;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "vaultwarden";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "vaultwarden";
+  };
 
   config = mkIf cfg.enable {
     services.vaultwarden = {

modules/nixos/services/ci/gitea-runner/default.nix

@@ -4,9 +4,9 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) types mkIf mkEnableOption mkOption genList mapAttrs optional attrValues concatLists listToAttrs;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   inherit (config.sops) secrets;
   inherit (config.networking) hostName;
   base = "${namespace}.services.ci.gitea-runner";

modules/nixos/services/ci/github-runner/default.nix

@@ -4,9 +4,9 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) types mkEnableOption mkOption mkIf optional mapAttrs';
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   inherit (config.networking) hostName;
   inherit (config.sops) secrets;
   base = "${namespace}.services.ci.github-runner";

modules/nixos/services/ci/pm2/default.nix

@@ -2,18 +2,18 @@
   config,
   lib,
   namespace,
+  pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.services.ci.pm2";
   cfg = getAttrByNamespace config base;
   userCfg = config.users.users;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "pm2";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "pm2";
+  };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [pm2];

modules/nixos/services/ci/slurm/default.nix

@@ -4,9 +4,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) types mkEnableOption mkOption mkIf groupBy mapAttrsToList attrNames mapAttrs concatStringsSep flatten;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace resolveHostIP;
   inherit (config.networking) hostName;
   base = "${namespace}.services.ci.slurm";
   cfg = getAttrByNamespace config base;

modules/nixos/services/metrics/grafana/default.nix

@@ -5,9 +5,9 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption attrNames filterAttrs elem head;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace resolveHostIP readJsonOrEmpty getIn;
   base = "${namespace}.services.metrics.grafana";
   cfg = getAttrByNamespace config base;
   pgCfg = getAttrByNamespace config "${namespace}.services.storage.postgresql";
@@ -15,10 +15,9 @@ with lib.${namespace}; let
 
   port = 5500;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Grafana";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Grafana";
+  };
 
   config = mkIf cfg.enable {
     services.grafana = {

modules/nixos/services/metrics/ntfy/default.nix

@@ -6,15 +6,16 @@
 }:
 with lib;
 with lib.${namespace}; let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.services.metrics.ntfy";
   cfg = getAttrByNamespace config base;
 
   port = 5201;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "ntfy";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "ntfy";
+  };
 
   config = mkIf cfg.enable {
     services.ntfy-sh = {

modules/nixos/services/metrics/uptime-kuma/default.nix

@@ -4,19 +4,18 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption mkForce;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   inherit (config.users) users;
   base = "${namespace}.services.metrics.uptime-kuma";
   cfg = getAttrByNamespace config base;
 
   port = 5200;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "uptime-kuma";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "uptime-kuma";
+  };
 
   config = mkIf cfg.enable {
     services.uptime-kuma = {

modules/nixos/services/networking/blocky/default.nix

@@ -4,19 +4,18 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption mapAttrsToList listToAttrs;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace resolveHostIP;
   base = "${namespace}.services.networking.blocky";
   cfg = getAttrByNamespace config base;
   networkCfg = getAttrByNamespace config "${namespace}.services.networking";
 
   port = 53;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "blocky";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "blocky";
+  };
 
   config = mkIf cfg.enable {
     services.blocky = {

modules/nixos/services/networking/default.nix

@@ -3,9 +3,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) types mkOption optional optionalString concatStringsSep;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace resolveHostIP;
   base = "${namespace}.services.networking";
   cfg = getAttrByNamespace config base;
   dnsCfg = getAttrByNamespace config "${base}.unbound";

modules/nixos/services/networking/httpd/default.nix

@@ -4,9 +4,9 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption mapAttrsToList listToAttrs replaceStrings mkMerge concatStringsSep filterAttrs;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace readJsonOrEmpty getIn;
   inherit (config.networking) hostName;
   base = "${namespace}.services.networking.httpd";
   cfg = getAttrByNamespace config base;
@@ -65,10 +65,9 @@ with lib.${namespace}; let
       // sslConfig;
   };
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Apache HTTPD";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Apache HTTPD";
+  };
 
   config = mkIf cfg.enable {
     services.httpd = {

modules/nixos/services/networking/network-manager/default.nix

@@ -4,16 +4,15 @@
   namespace,
   pkgs,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.services.networking.network-manager";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "network-manager";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "network-manager";
+  };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [networkmanagerapplet];

modules/nixos/services/networking/tailscale/default.nix

@@ -3,16 +3,15 @@
   lib,
   namespace,
   ...
-}:
-with lib;
-with lib.${namespace}; let
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  inherit (lib.${namespace}) getAttrByNamespace mkOptionsWithNamespace;
   base = "${namespace}.services.networking.tailscale";
   cfg = getAttrByNamespace config base;
 in {
-  options = with types;
-    mkOptionsWithNamespace base {
-      enable = mkEnableOption "Tailscale";
-    };
+  options = mkOptionsWithNamespace base {
+    enable = mkEnableOption "Tailscale";
+  };
 
   config = mkIf cfg.enable {
     services.tailscale.enable = true;