Simplify use of lib

nix/modules/home-manager/features/cli/bluetuith.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.cli.bluetuith.enable = lib.mkEnableOption "Enable bluetuith";
 
-  config = lib.mkIf config.features.cli.bluetuith.enable {
+{
+  options.features.cli.bluetuith.enable = mkEnableOption "Enable bluetuith";
+
+  config = mkIf config.features.cli.bluetuith.enable {
     home.packages = with pkgs; [
       bluetuith
     ];

nix/modules/home-manager/features/cli/direnv.nix

@@ -1,9 +1,11 @@
 { config, lib, ... }:
 
-{
+with lib;
-  options.features.cli.direnv.enable = lib.mkEnableOption "Enable direnv";
 
-  config = lib.mkIf config.features.cli.direnv.enable {
+{
+  options.features.cli.direnv.enable = mkEnableOption "Enable direnv";
+
+  config = mkIf config.features.cli.direnv.enable {
     programs.direnv = {
       enable = true;
       enableZshIntegration = true;

nix/modules/home-manager/features/cli/neovim.nix

@@ -6,10 +6,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.cli.neovim.enable = lib.mkEnableOption "Enable neovim";
 
-  config = lib.mkIf config.features.cli.neovim.enable {
+{
+  options.features.cli.neovim.enable = mkEnableOption "Enable neovim";
+
+  config = mkIf config.features.cli.neovim.enable {
     programs.neovim = {
       enable = true;
 

nix/modules/home-manager/features/cli/tmux-sessionizer.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.cli.tmux-sessionizer.enable = lib.mkEnableOption "Enable tmux-sessionizer";
 
-  config = lib.mkIf config.features.cli.tmux-sessionizer.enable {
+{
+  options.features.cli.tmux-sessionizer.enable = mkEnableOption "Enable tmux-sessionizer";
+
+  config = mkIf config.features.cli.tmux-sessionizer.enable {
     home.packages = with pkgs; [ custom-tmux-sessionizer ];
 
     home.file.".tmux-sessionizer".source = "${

nix/modules/home-manager/features/cli/tmux.nix

@@ -5,13 +5,15 @@
   ...
 }:
 
+with lib;
+
 let
   inherit (pkgs) tmuxPlugins;
 in
 {
-  options.features.cli.tmux.enable = lib.mkEnableOption "Enable tmux";
+  options.features.cli.tmux.enable = mkEnableOption "Enable tmux";
 
-  config = lib.mkIf config.features.cli.tmux.enable {
+  config = mkIf config.features.cli.tmux.enable {
     programs.tmux = {
       enable = true;
 

nix/modules/home-manager/features/desktop/alacritty.nix

@@ -4,10 +4,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.alacritty.enable = lib.mkEnableOption "Enable Alacritty";
 
-  config = lib.mkIf config.features.desktop.alacritty.enable {
+{
+  options.features.desktop.alacritty.enable = mkEnableOption "Enable Alacritty";
+
+  config = mkIf config.features.desktop.alacritty.enable {
     programs.alacritty = {
       enable = true;
 

nix/modules/home-manager/features/desktop/copyq.nix

@@ -1,9 +1,11 @@
 { config, lib, ... }:
 
-{
+with lib;
-  options.features.desktop.copyq.enable = lib.mkEnableOption "Enable copyq";
 
-  config = lib.mkIf config.features.desktop.copyq.enable {
+{
+  options.features.desktop.copyq.enable = mkEnableOption "Enable copyq";
+
+  config = mkIf config.features.desktop.copyq.enable {
     services.copyq.enable = true;
   };
 }

nix/modules/home-manager/features/desktop/discord.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.discord.enable = lib.mkEnableOption "Enable Discord";
 
-  config = lib.mkIf config.features.desktop.discord.enable {
+{
+  options.features.desktop.discord.enable = mkEnableOption "Enable Discord";
+
+  config = mkIf config.features.desktop.discord.enable {
     home.packages = with pkgs; [ discord ];
   };
 }

nix/modules/home-manager/features/desktop/espanso.nix

@@ -1,9 +1,11 @@
 { config, lib, ... }:
 
-{
+with lib;
-  options.features.desktop.espanso.enable = lib.mkEnableOption "Enable espanso";
 
-  config = lib.mkIf config.features.desktop.espanso.enable {
+{
+  options.features.desktop.espanso.enable = mkEnableOption "Enable espanso";
+
+  config = mkIf config.features.desktop.espanso.enable {
     services.espanso = {
       enable = true;
 

nix/modules/home-manager/features/desktop/flameshot.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.flameshot.enable = lib.mkEnableOption "Enable flameshot";
 
-  config = lib.mkIf config.features.desktop.flameshot.enable {
+{
+  options.features.desktop.flameshot.enable = mkEnableOption "Enable flameshot";
+
+  config = mkIf config.features.desktop.flameshot.enable {
     services.flameshot = {
       enable = true;
 

nix/modules/home-manager/features/desktop/gtk.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.gtk.enable = lib.mkEnableOption "Enable gtk";
 
-  config = lib.mkIf config.features.desktop.gtk.enable {
+{
+  options.features.desktop.gtk.enable = mkEnableOption "Enable gtk";
+
+  config = mkIf config.features.desktop.gtk.enable {
     gtk = {
       enable = true;
 

nix/modules/home-manager/features/desktop/media/gimp.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.media.gimp.enable = lib.mkEnableOption "Enable gimp";
 
-  config = lib.mkIf config.features.desktop.media.gimp.enable {
+{
+  options.features.desktop.media.gimp.enable = mkEnableOption "Enable gimp";
+
+  config = mkIf config.features.desktop.media.gimp.enable {
     home.packages = with pkgs; [ gimp ];
   };
 }

nix/modules/home-manager/features/desktop/media/handbrake.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.media.handbrake.enable = lib.mkEnableOption "Enable handbrake";
 
-  config = lib.mkIf config.features.desktop.media.handbrake.enable {
+{
+  options.features.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake";
+
+  config = mkIf config.features.desktop.media.handbrake.enable {
     home.packages = with pkgs; [ handbrake ];
   };
 }

nix/modules/home-manager/features/desktop/media/kdenlive.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.media.kdenlive.enable = lib.mkEnableOption "Enable kdenlive";
 
-  config = lib.mkIf config.features.desktop.media.kdenlive.enable {
+{
+  options.features.desktop.media.kdenlive.enable = mkEnableOption "Enable kdenlive";
+
+  config = mkIf config.features.desktop.media.kdenlive.enable {
     home.packages = with pkgs; [ kdenlive ];
   };
 }

nix/modules/home-manager/features/desktop/media/mpv.nix

@@ -1,9 +1,11 @@
 { config, lib, ... }:
 
-{
+with lib;
-  options.features.desktop.media.mpv.enable = lib.mkEnableOption "Enable mpv media player";
 
-  config = lib.mkIf config.features.desktop.media.mpv.enable {
+{
+  options.features.desktop.media.mpv.enable = mkEnableOption "Enable mpv media player";
+
+  config = mkIf config.features.desktop.media.mpv.enable {
     programs.mpv = {
       enable = true;
 

nix/modules/home-manager/features/desktop/media/pocket-casts.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.media.pocket-casts.enable = lib.mkEnableOption "Enable Pocket Casts";
 
-  config = lib.mkIf config.features.desktop.media.pocket-casts.enable {
+{
+  options.features.desktop.media.pocket-casts.enable = mkEnableOption "Enable Pocket Casts";
+
+  config = mkIf config.features.desktop.media.pocket-casts.enable {
     home.packages = with pkgs; [ pocket-casts ];
   };
 }

nix/modules/home-manager/features/desktop/slack.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.slack.enable = lib.mkEnableOption "Enable Slack";
 
-  config = lib.mkIf config.features.desktop.slack.enable {
+{
+  options.features.desktop.slack.enable = mkEnableOption "Enable Slack";
+
+  config = mkIf config.features.desktop.slack.enable {
     home.packages = with pkgs; [ slack ];
   };
 }

nix/modules/home-manager/features/desktop/zoom.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.zoom.enable = lib.mkEnableOption "Enable zoom";
 
-  config = lib.mkIf config.features.desktop.zoom.enable {
+{
+  options.features.desktop.zoom.enable = mkEnableOption "Enable zoom";
+
+  config = mkIf config.features.desktop.zoom.enable {
     home.packages = with pkgs; [ nixpkgs-2405.zoom-us ];
   };
 }

nix/modules/nixos/features/cli/docker.nix

@@ -1,9 +1,11 @@
 { lib, config, ... }:
 
-{
+with lib;
-  options.features.cli.docker.enable = lib.mkEnableOption "Enable Docker";
 
-  config = lib.mkIf config.features.cli.docker.enable {
+{
+  options.features.cli.docker.enable = mkEnableOption "Enable Docker";
+
+  config = mkIf config.features.cli.docker.enable {
     virtualisation.docker = {
       enable = true;
 

nix/modules/nixos/features/desktop/peek.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.peek.enable = lib.mkEnableOption "Enable peek";
 
-  config = lib.mkIf config.features.desktop.peek.enable {
+{
+  options.features.desktop.peek.enable = mkEnableOption "Enable peek";
+
+  config = mkIf config.features.desktop.peek.enable {
     environment.systemPackages = with pkgs; [ peek ];
   };
 }

nix/modules/nixos/features/desktop/screenkey.nix

@@ -6,10 +6,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.screenkey.enable = lib.mkEnableOption "Enable screenkey";
 
-  config = lib.mkIf config.features.desktop.screenkey.enable {
+{
+  options.features.desktop.screenkey.enable = mkEnableOption "Enable screenkey";
+
+  config = mkIf config.features.desktop.screenkey.enable {
     environment.systemPackages = with pkgs; [ screenkey ];
 
     home-manager.users.${username}.xdg.configFile."screenkey.json".text = builtins.toJSON {

nix/modules/nixos/features/gaming.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.desktop.gaming.enable = lib.mkEnableOption "Enable games";
 
-  config = lib.mkIf config.features.desktop.gaming.enable {
+{
+  options.features.desktop.gaming.enable = mkEnableOption "Enable games";
+
+  config = mkIf config.features.desktop.gaming.enable {
     programs.steam.enable = true;
 
     environment.systemPackages = with pkgs; [ zeroad ];

nix/modules/nixos/features/homelab/gitea.nix

@@ -1,9 +1,11 @@
 { config, lib, ... }:
 
-{
+with lib;
-  options.features.homelab.gitea.enable = lib.mkEnableOption "Enable gitea";
 
-  config = lib.mkIf config.features.homelab.gitea.enable {
+{
+  options.features.homelab.gitea.enable = mkEnableOption "Enable gitea";
+
+  config = mkIf config.features.homelab.gitea.enable {
     services.gitea = {
       enable = true;
 

nix/modules/nixos/features/homelab/immich.nix

@@ -5,10 +5,12 @@
   ...
 }:
 
-{
+with lib;
-  options.features.homelab.immich.enable = lib.mkEnableOption "Enable immich";
 
-  config = lib.mkIf config.features.homelab.immich.enable {
+{
+  options.features.homelab.immich.enable = mkEnableOption "Enable immich";
+
+  config = mkIf config.features.homelab.immich.enable {
     services.immich.enable = true;
 
     environment.systemPackages = [ pkgs.immich-cli ];

nix/modules/nixos/features/homelab/jellyfin.nix

@@ -1,9 +1,11 @@
 { config, lib, ... }:
 
-{
+with lib;
-  options.features.homelab.jellyfin.enable = lib.mkEnableOption "Enable jellyfin";
 
-  config = lib.mkIf config.features.homelab.jellyfin.enable {
+{
+  options.features.homelab.jellyfin.enable = mkEnableOption "Enable jellyfin";
+
+  config = mkIf config.features.homelab.jellyfin.enable {
     services.jellyfin = {
       enable = true;
       openFirewall = true;