From 5a13b371bc5e962c51073a6a7b3d0331a4016a04 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Mon, 28 Aug 2023 09:49:00 -0400
Subject: [PATCH] flake: move home manager profiles into hm-system-defaults

---
 flake.nix                             | 20 +-------------------
 modules/global/hm-system-defaults.nix | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index d86a59a..342841b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,25 +120,7 @@
 
                     sharedModules = [
                       inputs.impermanence.nixosModules.home-manager.impermanence
-                    ] ++ (with profiles; [
-                      # Base Configuration
-                      xdg
-
-                      # Programs
-                      direnv
-                      git
-                      emacs
-                      vim
-                      gpg
-                      ssh
-                      keychain
-
-                      # Terminal
-                      starship
-                      shells.all
-                      tmux
-
-                    ]) ++ (self.lib.leaves ./users/modules);
+                    ] ++ (self.lib.leaves ./users/modules);
 
                     extraSpecialArgs = {
                       inherit profiles;
diff --git a/modules/global/hm-system-defaults.nix b/modules/global/hm-system-defaults.nix
index f9189e1..85e886a 100644
--- a/modules/global/hm-system-defaults.nix
+++ b/modules/global/hm-system-defaults.nix
@@ -10,7 +10,23 @@
     sharedModules = [
       ({ profiles, ... }: {
         imports = with profiles; [
+          # Base configuration
+          xdg
+
+          # Programs
+          direnv
+          emacs
+          git
+          gpg
           htop
+          keychain
+          ssh
+          vim
+
+          # Terminal
+          shells.all
+          starship
+          tmux
         ];
 
         home = {