hmApps, refactor, clean up, break groups

hmModules/apps/alacritty/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.alacritty = {

hmModules/apps/chat/default.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./discord
-    ./beeper
-  ];
-}

hmModules/apps/default.nix

@@ -1,20 +1,6 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./chat
-    ./file-browsers
-    ./gimp
-    ./git
-    ./hypr
-    ./librewolf
-    ./lutris
-    ./media-viewers
-    ./neovim
-    ./obs
-    ./rofi
-    ./shells
-    ./terminal-emulators
-    ./zoxide
-  ];
+{ lib, ... }: let
+  fs = lib.fileset;
+  appFilter = {name, ...}: name == "app.nix";
+in {
+  imports = fs.toList (fs.fileFilter appFilter ./.);
 }

hmModules/apps/feh/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.feh = {

hmModules/apps/file-browsers/default.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./lf
-    ./nnn
-  ];
-}

hmModules/apps/fish/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 let
   functionModule = with lib.types; submodule {
     options = {

hmModules/apps/git/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.git = {

hmModules/apps/kitty/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.kitty = {

hmModules/apps/media-viewers/default.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./feh
-    ./mpv
-    ./zathura
-  ];
-}

hmModules/apps/nnn/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.nnn = {

hmModules/apps/shells/default.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./fish
-    ./xonsh
-    ./zsh
-  ];
-}

hmModules/apps/terminal-emulators/default.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./kitty
-    ./alacritty
-  ];
-}

hmModules/apps/zathura/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.zathura = {

hmModules/apps/zoxide/app.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.zoxide = {