From 49cb3c949ca24cc956ad11412444de66f1faeb88 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Fri, 29 Nov 2024 02:20:20 -0800
Subject: [PATCH] hmServices, refactor extension, home to automatic

---
 .../{services/home => automatic}/default.nix   |  2 +-
 hmModules/default.nix                          |  3 ++-
 hmModules/services/default.nix                 | 18 +++++-------------
 .../dunst/{default.nix => service.nix}         |  0
 .../manpages/{default.nix => service.nix}      |  0
 .../services/ssh/{default.nix => service.nix}  |  0
 .../timers/{default.nix => service.nix}        |  2 +-
 .../trash/{default.nix => service.nix}         |  2 +-
 .../services/wal/{default.nix => service.nix}  |  2 +-
 .../widgets/{default.nix => service.nix}       |  2 +-
 10 files changed, 12 insertions(+), 19 deletions(-)
 rename hmModules/{services/home => automatic}/default.nix (97%)
 rename hmModules/services/dunst/{default.nix => service.nix} (100%)
 rename hmModules/services/manpages/{default.nix => service.nix} (100%)
 rename hmModules/services/ssh/{default.nix => service.nix} (100%)
 rename hmModules/services/timers/{default.nix => service.nix} (98%)
 rename hmModules/services/trash/{default.nix => service.nix} (84%)
 rename hmModules/services/wal/{default.nix => service.nix} (97%)
 rename hmModules/services/widgets/{default.nix => service.nix} (61%)

diff --git a/hmModules/services/home/default.nix b/hmModules/automatic/default.nix
similarity index 97%
rename from hmModules/services/home/default.nix
rename to hmModules/automatic/default.nix
index 7bf691a..4c41659 100644
--- a/hmModules/services/home/default.nix
+++ b/hmModules/automatic/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options = {
diff --git a/hmModules/default.nix b/hmModules/default.nix
index 3401811..b12278c 100644
--- a/hmModules/default.nix
+++ b/hmModules/default.nix
@@ -1,8 +1,9 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
     ./apps
+    ./automatic
     ./services
   ];
 }
diff --git a/hmModules/services/default.nix b/hmModules/services/default.nix
index 75bc088..5718b40 100644
--- a/hmModules/services/default.nix
+++ b/hmModules/services/default.nix
@@ -1,14 +1,6 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./dunst
-    ./home
-    ./manpages
-    ./ssh
-    ./timers
-    ./trash
-    ./wal
-    ./widgets
-  ];
+{ lib, ... }: let
+  fs = lib.fileset;
+  appFilter = {name, ...}: name == "service.nix";
+in {
+  imports = fs.toList (fs.fileFilter appFilter ./.);
 }
diff --git a/hmModules/services/dunst/default.nix b/hmModules/services/dunst/service.nix
similarity index 100%
rename from hmModules/services/dunst/default.nix
rename to hmModules/services/dunst/service.nix
diff --git a/hmModules/services/manpages/default.nix b/hmModules/services/manpages/service.nix
similarity index 100%
rename from hmModules/services/manpages/default.nix
rename to hmModules/services/manpages/service.nix
diff --git a/hmModules/services/ssh/default.nix b/hmModules/services/ssh/service.nix
similarity index 100%
rename from hmModules/services/ssh/default.nix
rename to hmModules/services/ssh/service.nix
diff --git a/hmModules/services/timers/default.nix b/hmModules/services/timers/service.nix
similarity index 98%
rename from hmModules/services/timers/default.nix
rename to hmModules/services/timers/service.nix
index 548ab30..175b107 100644
--- a/hmModules/services/timers/default.nix
+++ b/hmModules/services/timers/service.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 let rootPath = ./.; in
 {
   options.timer = {
diff --git a/hmModules/services/trash/default.nix b/hmModules/services/trash/service.nix
similarity index 84%
rename from hmModules/services/trash/default.nix
rename to hmModules/services/trash/service.nix
index cf54f67..e5f1542 100644
--- a/hmModules/services/trash/default.nix
+++ b/hmModules/services/trash/service.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 {
   options.trash = {
diff --git a/hmModules/services/wal/default.nix b/hmModules/services/wal/service.nix
similarity index 97%
rename from hmModules/services/wal/default.nix
rename to hmModules/services/wal/service.nix
index 41930fe..447db08 100644
--- a/hmModules/services/wal/default.nix
+++ b/hmModules/services/wal/service.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-let rootPath = ./.; in
+
 {
   options.colors = {
     enable = lib.mkEnableOption "Enables setting colors using wallust";
diff --git a/hmModules/services/widgets/default.nix b/hmModules/services/widgets/service.nix
similarity index 61%
rename from hmModules/services/widgets/default.nix
rename to hmModules/services/widgets/service.nix
index caebead..b679c72 100644
--- a/hmModules/services/widgets/default.nix
+++ b/hmModules/services/widgets/service.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
   imports = [