Group modules into feature directories

nix/modules/home-manager/default.nix

@@ -1,42 +1,8 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}:
+{ ... }:
 
 {
   imports = [
-    (import ./neovim.nix {
-      inherit
-        config
-        inputs
-        lib
-        pkgs
-        ;
-    })
-
-    ./alacritty.nix
-    ./bat.nix
-    ./bin.nix
-    ./bluetuith.nix
-    ./copyq.nix
-    ./direnv.nix
-    ./espanso.nix
-    ./flameshot.nix
-    ./fzf.nix
-    ./git.nix
-    ./gtk.nix
-    ./htop.nix
-    ./lsd.nix
-    ./mpv.nix
-    ./pet.nix
-    ./phpactor.nix
-    ./ripgrep.nix
-    ./starship.nix
-    ./syncthing.nix
-    ./tmux.nix
-    ./zsh.nix
+    ./features/cli
+    ./features/desktop
   ];
 }

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

@@ -0,0 +1,37 @@
+{
+  config,
+  inputs,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    # (import ./neovim.nix {
+    #   inherit
+    #     config
+    #     inputs
+    #     lib
+    #     pkgs
+    #     ;
+    # })
+
+    ./bat.nix
+    ./bin.nix
+    ./bluetuith.nix
+    ./direnv.nix
+    ./fzf.nix
+    ./git.nix
+    ./htop.nix
+    ./lsd.nix
+    ./neovim.nix
+    ./pet.nix
+    ./phpactor.nix
+    ./ripgrep.nix
+    ./starship.nix
+    ./syncthing.nix
+    ./tmux.nix
+    ./zsh.nix
+  ];
+}

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

@@ -0,0 +1,13 @@
+{
+  imports = [
+    ./alacritty.nix
+    ./copyq.nix
+    ./discord.nix
+    ./espanso.nix
+    ./flameshot.nix
+    ./gtk.nix
+    ./media
+    ./slack.nix
+    ./zoom.nix
+  ];
+}

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

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

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

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./gimp.nix
+    ./kdenlive.nix
+    ./mpv.nix
+    ./pocket-casts.nix
+  ];
+}

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

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

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

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

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

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

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

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

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

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

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

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