chore: cleanup modules

isabelroses · Feb 21, 2024 · fdfc3e9 · fdfc3e9
1 parent ed5f0db
commit fdfc3e9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/flake/modules/default.nix b/flake/modules/default.nix
@@ -20,6 +20,8 @@ in {
     homeManagerModules = {
       gtklock = mkModule /modules/extra/home-manager/gtklock.nix;
 
+      hyfetch = mkModule /modules/extra/home-manager/hyfetch.nix;
+
       swaync = mkModule /modules/extra/home-manager/swaync.nix;
 
       default = builtins.throw "There is no default module.";

diff --git a/home/isabel/default.nix b/home/isabel/default.nix
@@ -1,16 +1,11 @@
 {
   lib,
   pkgs,
-  self,
   ...
 }: let
   inherit (lib) mkDefault ldTernary;
 in {
   imports = [
-    # imported home-manager modules
-    self.homeManagerModules.gtklock
-    self.homeManagerModules.swaync
-
     # important system environment config
     ./system
     # programs that are used, e.g. GUI apps

diff --git a/home/isabel/programs/configs/gui/swaync.nix b/home/isabel/programs/configs/gui/swaync.nix
@@ -1,10 +1,13 @@
 {
   lib,
+  self,
   osConfig,
   ...
 }: let
   inherit (lib) mkIf;
 in {
+  imports = [self.homeManagerModules.swaync];
+
   services.swaync = mkIf osConfig.modules.programs.gui.bars.waybar.enable {
     enable = true;
     systemd.enable = true;

diff --git a/home/isabel/services/wayland/screenlock/gtklock.nix b/home/isabel/services/wayland/screenlock/gtklock.nix
@@ -1,12 +1,15 @@
 {
   lib,
   pkgs,
+  self,
   osConfig,
   defaults,
   ...
 }: let
   inherit (lib) mkIf isWayland;
 in {
+  imports = [self.homeManagerModules.gtklock];
+
   config = mkIf ((isWayland osConfig) && defaults.screenLocker == "gtklock") {
     programs.gtklock = {
       enable = true;