diff --git a/nix/modules/home-manager/features/cli/bluetuith.nix b/nix/modules/home-manager/features/cli/bluetuith.nix
index f13fb007..e52812e6 100644
--- a/nix/modules/home-manager/features/cli/bluetuith.nix
+++ b/nix/modules/home-manager/features/cli/bluetuith.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.cli.bluetuith.enable = lib.mkEnableOption "Enable bluetuith";
+with lib;
- 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
];
diff --git a/nix/modules/home-manager/features/cli/direnv.nix b/nix/modules/home-manager/features/cli/direnv.nix
index 59b4b769..0509ce5b 100644
--- a/nix/modules/home-manager/features/cli/direnv.nix
+++ b/nix/modules/home-manager/features/cli/direnv.nix
@@ -1,9 +1,11 @@
{ config, lib, ... }:
-{
- options.features.cli.direnv.enable = lib.mkEnableOption "Enable direnv";
+with lib;
- 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;
diff --git a/nix/modules/home-manager/features/cli/neovim.nix b/nix/modules/home-manager/features/cli/neovim.nix
index 30bb5234..0dc4cea3 100644
--- a/nix/modules/home-manager/features/cli/neovim.nix
+++ b/nix/modules/home-manager/features/cli/neovim.nix
@@ -6,10 +6,12 @@
...
}:
-{
- options.features.cli.neovim.enable = lib.mkEnableOption "Enable neovim";
+with lib;
- 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;
diff --git a/nix/modules/home-manager/features/cli/tmux-sessionizer.nix b/nix/modules/home-manager/features/cli/tmux-sessionizer.nix
index 4aeba088..b41510eb 100644
--- a/nix/modules/home-manager/features/cli/tmux-sessionizer.nix
+++ b/nix/modules/home-manager/features/cli/tmux-sessionizer.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.cli.tmux-sessionizer.enable = lib.mkEnableOption "Enable tmux-sessionizer";
+with lib;
- 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 = "${
diff --git a/nix/modules/home-manager/features/cli/tmux.nix b/nix/modules/home-manager/features/cli/tmux.nix
index 47b7055f..49aa00f5 100644
--- a/nix/modules/home-manager/features/cli/tmux.nix
+++ b/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;
diff --git a/nix/modules/home-manager/features/desktop/alacritty.nix b/nix/modules/home-manager/features/desktop/alacritty.nix
index 2b351a61..77cc625d 100644
--- a/nix/modules/home-manager/features/desktop/alacritty.nix
+++ b/nix/modules/home-manager/features/desktop/alacritty.nix
@@ -4,10 +4,12 @@
...
}:
-{
- options.features.desktop.alacritty.enable = lib.mkEnableOption "Enable Alacritty";
+with lib;
- 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;
diff --git a/nix/modules/home-manager/features/desktop/copyq.nix b/nix/modules/home-manager/features/desktop/copyq.nix
index fba783e0..7a4ca6a7 100644
--- a/nix/modules/home-manager/features/desktop/copyq.nix
+++ b/nix/modules/home-manager/features/desktop/copyq.nix
@@ -1,9 +1,11 @@
{ config, lib, ... }:
-{
- options.features.desktop.copyq.enable = lib.mkEnableOption "Enable copyq";
+with lib;
- 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;
};
}
diff --git a/nix/modules/home-manager/features/desktop/discord.nix b/nix/modules/home-manager/features/desktop/discord.nix
index 5fed5daa..abf8cd8f 100644
--- a/nix/modules/home-manager/features/desktop/discord.nix
+++ b/nix/modules/home-manager/features/desktop/discord.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.discord.enable = lib.mkEnableOption "Enable Discord";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/home-manager/features/desktop/espanso.nix b/nix/modules/home-manager/features/desktop/espanso.nix
index 8619a296..9f3d0be0 100644
--- a/nix/modules/home-manager/features/desktop/espanso.nix
+++ b/nix/modules/home-manager/features/desktop/espanso.nix
@@ -1,9 +1,11 @@
{ config, lib, ... }:
-{
- options.features.desktop.espanso.enable = lib.mkEnableOption "Enable espanso";
+with lib;
- 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;
diff --git a/nix/modules/home-manager/features/desktop/flameshot.nix b/nix/modules/home-manager/features/desktop/flameshot.nix
index c5540fd3..d9a77d8c 100644
--- a/nix/modules/home-manager/features/desktop/flameshot.nix
+++ b/nix/modules/home-manager/features/desktop/flameshot.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.flameshot.enable = lib.mkEnableOption "Enable flameshot";
+with lib;
- 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;
diff --git a/nix/modules/home-manager/features/desktop/gtk.nix b/nix/modules/home-manager/features/desktop/gtk.nix
index 7644b6cb..f68563b3 100644
--- a/nix/modules/home-manager/features/desktop/gtk.nix
+++ b/nix/modules/home-manager/features/desktop/gtk.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.gtk.enable = lib.mkEnableOption "Enable gtk";
+with lib;
- 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;
diff --git a/nix/modules/home-manager/features/desktop/media/gimp.nix b/nix/modules/home-manager/features/desktop/media/gimp.nix
index 8597aebb..db012675 100644
--- a/nix/modules/home-manager/features/desktop/media/gimp.nix
+++ b/nix/modules/home-manager/features/desktop/media/gimp.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.media.gimp.enable = lib.mkEnableOption "Enable gimp";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/home-manager/features/desktop/media/handbrake.nix b/nix/modules/home-manager/features/desktop/media/handbrake.nix
index 412b9fae..e27a215a 100644
--- a/nix/modules/home-manager/features/desktop/media/handbrake.nix
+++ b/nix/modules/home-manager/features/desktop/media/handbrake.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.media.handbrake.enable = lib.mkEnableOption "Enable handbrake";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/home-manager/features/desktop/media/kdenlive.nix b/nix/modules/home-manager/features/desktop/media/kdenlive.nix
index b6f7b21c..70695407 100644
--- a/nix/modules/home-manager/features/desktop/media/kdenlive.nix
+++ b/nix/modules/home-manager/features/desktop/media/kdenlive.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.media.kdenlive.enable = lib.mkEnableOption "Enable kdenlive";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/home-manager/features/desktop/media/mpv.nix b/nix/modules/home-manager/features/desktop/media/mpv.nix
index f06a6e21..2704dad0 100644
--- a/nix/modules/home-manager/features/desktop/media/mpv.nix
+++ b/nix/modules/home-manager/features/desktop/media/mpv.nix
@@ -1,9 +1,11 @@
{ config, lib, ... }:
-{
- options.features.desktop.media.mpv.enable = lib.mkEnableOption "Enable mpv media player";
+with lib;
- 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;
diff --git a/nix/modules/home-manager/features/desktop/media/pocket-casts.nix b/nix/modules/home-manager/features/desktop/media/pocket-casts.nix
index 6f088c43..d71183b9 100644
--- a/nix/modules/home-manager/features/desktop/media/pocket-casts.nix
+++ b/nix/modules/home-manager/features/desktop/media/pocket-casts.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.media.pocket-casts.enable = lib.mkEnableOption "Enable Pocket Casts";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/home-manager/features/desktop/slack.nix b/nix/modules/home-manager/features/desktop/slack.nix
index 463a91e1..344cf861 100644
--- a/nix/modules/home-manager/features/desktop/slack.nix
+++ b/nix/modules/home-manager/features/desktop/slack.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.slack.enable = lib.mkEnableOption "Enable Slack";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/home-manager/features/desktop/zoom.nix b/nix/modules/home-manager/features/desktop/zoom.nix
index d1a6c458..417d78ef 100644
--- a/nix/modules/home-manager/features/desktop/zoom.nix
+++ b/nix/modules/home-manager/features/desktop/zoom.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.zoom.enable = lib.mkEnableOption "Enable zoom";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/nixos/features/cli/docker.nix b/nix/modules/nixos/features/cli/docker.nix
index 8aa12321..10e42634 100644
--- a/nix/modules/nixos/features/cli/docker.nix
+++ b/nix/modules/nixos/features/cli/docker.nix
@@ -1,9 +1,11 @@
{ lib, config, ... }:
-{
- options.features.cli.docker.enable = lib.mkEnableOption "Enable Docker";
+with lib;
- 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;
diff --git a/nix/modules/nixos/features/desktop/peek.nix b/nix/modules/nixos/features/desktop/peek.nix
index da593d7e..85137d9f 100644
--- a/nix/modules/nixos/features/desktop/peek.nix
+++ b/nix/modules/nixos/features/desktop/peek.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.peek.enable = lib.mkEnableOption "Enable peek";
+with lib;
- 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 ];
};
}
diff --git a/nix/modules/nixos/features/desktop/screenkey.nix b/nix/modules/nixos/features/desktop/screenkey.nix
index 185de462..9bebebfe 100644
--- a/nix/modules/nixos/features/desktop/screenkey.nix
+++ b/nix/modules/nixos/features/desktop/screenkey.nix
@@ -6,10 +6,12 @@
...
}:
-{
- options.features.desktop.screenkey.enable = lib.mkEnableOption "Enable screenkey";
+with lib;
- 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 {
diff --git a/nix/modules/nixos/features/gaming.nix b/nix/modules/nixos/features/gaming.nix
index d7dd0747..c8f4d40b 100644
--- a/nix/modules/nixos/features/gaming.nix
+++ b/nix/modules/nixos/features/gaming.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.desktop.gaming.enable = lib.mkEnableOption "Enable games";
+with lib;
- 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 ];
diff --git a/nix/modules/nixos/features/homelab/gitea.nix b/nix/modules/nixos/features/homelab/gitea.nix
index 47d17600..4667e433 100644
--- a/nix/modules/nixos/features/homelab/gitea.nix
+++ b/nix/modules/nixos/features/homelab/gitea.nix
@@ -1,9 +1,11 @@
{ config, lib, ... }:
-{
- options.features.homelab.gitea.enable = lib.mkEnableOption "Enable gitea";
+with lib;
- 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;
diff --git a/nix/modules/nixos/features/homelab/immich.nix b/nix/modules/nixos/features/homelab/immich.nix
index 6bd923c0..8b4a5f5a 100644
--- a/nix/modules/nixos/features/homelab/immich.nix
+++ b/nix/modules/nixos/features/homelab/immich.nix
@@ -5,10 +5,12 @@
...
}:
-{
- options.features.homelab.immich.enable = lib.mkEnableOption "Enable immich";
+with lib;
- 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 ];
diff --git a/nix/modules/nixos/features/homelab/jellyfin.nix b/nix/modules/nixos/features/homelab/jellyfin.nix
index f650ca02..0ac9fef0 100644
--- a/nix/modules/nixos/features/homelab/jellyfin.nix
+++ b/nix/modules/nixos/features/homelab/jellyfin.nix
@@ -1,9 +1,11 @@
{ config, lib, ... }:
-{
- options.features.homelab.jellyfin.enable = lib.mkEnableOption "Enable jellyfin";
+with lib;
- 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;