Group modules into feature directories

nix/home/opdavies/default.nix

@@ -61,11 +61,8 @@ in
       [
         brave
         build-glove80
-        discord
-        gimp
         gscan2pdf
         handbrake
-        kdenlive
         meslo-lg
         obs-studio
         okular
@@ -74,11 +71,8 @@ in
         pavucontrol
         pinentry
         via
-        pocket-casts
         xcape
         xsel
-
-        pkgs.nixpkgs-2405.zoom-us
       ]
     );
 

nix/home/opdavies/hosts/lemp11.nix

@@ -9,10 +9,20 @@
 
     desktop = {
       copyq.enable = true;
+      discord.enable = true;
       espanso.enable = true;
       flameshot.enable = true;
       gtk.enable = true;
+      slack.enable = true;
+
+      media = {
+        gimp.enable = true;
+        kdenlive.enable = true;
+        pocket-casts.enable = true;
         mpv.enable = true;
       };
+
+      zoom.enable = true;
+    };
   };
 }

nix/hosts/lemp11/configuration.nix

@@ -195,14 +195,10 @@
       rclone
       rclone-browser
       shotwell
-      slack
       vscode
       xfce.thunar
       xfce.thunar-volman
       xfce.tumbler
-
-      # Games.
-      zeroad
     ];
 
   # Some programs need SUID wrappers, can be configured further or are

nix/hosts/lemp11/default.nix

@@ -1,3 +1,15 @@
 {
+  features = {
+    desktop = {
+      gaming.enable = true;
+
+      homelab = {
+        gitea.enable = true;
+        immich.enable = true;
+        jellyfin.enable = true;
+      };
+    };
+  };
+
   imports = [ ./configuration.nix ];
 }

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 ];
+  };
+}

nix/modules/nixos/default.nix

@@ -2,11 +2,10 @@
   imports = [
     ./autorandr.nix
     ./docker.nix
+    ./features/gaming.nix
+    ./features/homelab
     ./fonts.nix
-    ./gitea.nix
     ./i3.nix
-    ./immich.nix
-    ./jellyfin.nix
     ./kanata.nix
     ./rofi.nix
     ./rsnapshot.nix

nix/modules/nixos/features/gaming.nix

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

nix/modules/nixos/features/homelab/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./gitea.nix
+    ./immich.nix
+    ./jellyfin.nix
+  ];
+}

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

@@ -0,0 +1,21 @@
+{ config, lib, ... }:
+
+{
+  options.features.desktop.homelab.gitea.enable = lib.mkEnableOption "Enable gitea";
+
+  config = lib.mkIf config.features.desktop.homelab.gitea.enable {
+    services.gitea = {
+      enable = true;
+
+      settings = {
+        server = {
+          HTTP_PORT = 2222;
+        };
+
+        service = {
+          DISABLE_REGISTRATION = true;
+        };
+      };
+    };
+  };
+}

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

@@ -0,0 +1,16 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options.features.desktop.homelab.immich.enable = lib.mkEnableOption "Enable immich";
+
+  config = lib.mkIf config.features.desktop.homelab.immich.enable {
+    services.immich.enable = true;
+
+    environment.systemPackages = [ pkgs.immich-cli ];
+  };
+}

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

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

nix/modules/nixos/gitea.nix

@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.gitea = {
-    enable = true;
-
-    settings = {
-      server = {
-        HTTP_PORT = 2222;
-      };
-
-      service = {
-        DISABLE_REGISTRATION = true;
-      };
-    };
-  };
-}

nix/modules/nixos/immich.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.immich.enable = true;
-
-  environment.systemPackages = [ pkgs.immich-cli ];
-}

nix/modules/nixos/jellyfin.nix

@@ -1,6 +0,0 @@
-{
-  services.jellyfin = {
-    enable = true;
-    openFirewall = true;
-  };
-}