From b24034aa535277aa8d12ea880844b51fbc7c751d Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Thu, 3 Aug 2023 11:18:45 -0400
Subject: [PATCH] global/hm-system-defaults: make some profiles global

---
 modules/global/hm-system-defaults.nix | 16 ++++++++++++----
 users/infinidoge/default.nix          | 15 +++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/global/hm-system-defaults.nix b/modules/global/hm-system-defaults.nix
index c450426..f9189e1 100644
--- a/modules/global/hm-system-defaults.nix
+++ b/modules/global/hm-system-defaults.nix
@@ -8,7 +8,11 @@
     };
 
     sharedModules = [
-      {
+      ({ profiles, ... }: {
+        imports = with profiles; [
+          htop
+        ];
+
         home = {
           stateVersion = config.system.stateVersion;
           sessionVariables = {
@@ -24,16 +28,20 @@
             };
           };
         };
-      }
+      })
       (lib.mkIf config.services.xserver.enable {
         xsession.enable = true;
       })
-      (lib.mkIf config.info.graphical {
+      (lib.mkIf config.info.graphical ({ profiles, ... }: {
+        imports = with profiles; [
+          kitty
+        ];
+
         xdg.systemDirs.data = [
           "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
           "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
         ];
-      })
+      }))
     ];
   };
 }
diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index b30790b..75dbe69 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -10,16 +10,11 @@ in
 
   home = { config, main, profiles, ... }: {
     imports = flatten [
-      (with profiles; [
-        htop
-
-        (ifGraphical' [
-          kitty
-          rofi
-          themeing
-          flameshot
-        ])
-      ])
+      (ifGraphical' (with profiles; [
+        rofi
+        themeing
+        flameshot
+      ]))
 
       ./config
     ];