From 187ae3d98f1727fc665297ccab25ade41759182a Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler@tylermayoff.com>
Date: Sat, 8 Mar 2025 22:59:33 -0500
Subject: [PATCH] Reorganized mal

---
 dot_config/flake/flake.nix                        | 15 ++++++++++++++-
 .../{nixos => machines}/mal/configuration.nix     |  0
 .../mal/encrypted_private_secrets.sh.age          |  0
 .../mal/hardware-configuration.nix                |  0
 .../{home/mal/mal.nix => machines/mal/home.nix}   |  5 ++++-
 5 files changed, 18 insertions(+), 2 deletions(-)
 rename dot_config/flake/{nixos => machines}/mal/configuration.nix (100%)
 rename dot_config/flake/{nixos => machines}/mal/encrypted_private_secrets.sh.age (100%)
 rename dot_config/flake/{nixos => machines}/mal/hardware-configuration.nix (100%)
 rename dot_config/flake/{home/mal/mal.nix => machines/mal/home.nix} (58%)

diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index 69b1ab0..2958b32 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -50,7 +50,20 @@
     nixosConfigurations = {
       mal = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
-        modules = [./nixos/mal/configuration.nix];
+        modules = [
+          ./machines/mal/configuration.nix
+
+          lix-module.nixosModules.default
+
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+
+            home-manager.extraSpecialArgs = {inherit inputs outputs;};
+            home-manager.users.tyler = import ./machines/mal/home.nix;
+          }
+        ];
       };
 
       wash = nixpkgs.lib.nixosSystem {
diff --git a/dot_config/flake/nixos/mal/configuration.nix b/dot_config/flake/machines/mal/configuration.nix
similarity index 100%
rename from dot_config/flake/nixos/mal/configuration.nix
rename to dot_config/flake/machines/mal/configuration.nix
diff --git a/dot_config/flake/nixos/mal/encrypted_private_secrets.sh.age b/dot_config/flake/machines/mal/encrypted_private_secrets.sh.age
similarity index 100%
rename from dot_config/flake/nixos/mal/encrypted_private_secrets.sh.age
rename to dot_config/flake/machines/mal/encrypted_private_secrets.sh.age
diff --git a/dot_config/flake/nixos/mal/hardware-configuration.nix b/dot_config/flake/machines/mal/hardware-configuration.nix
similarity index 100%
rename from dot_config/flake/nixos/mal/hardware-configuration.nix
rename to dot_config/flake/machines/mal/hardware-configuration.nix
diff --git a/dot_config/flake/home/mal/mal.nix b/dot_config/flake/machines/mal/home.nix
similarity index 58%
rename from dot_config/flake/home/mal/mal.nix
rename to dot_config/flake/machines/mal/home.nix
index f64fd05..5e603fd 100644
--- a/dot_config/flake/home/mal/mal.nix
+++ b/dot_config/flake/machines/mal/home.nix
@@ -1,5 +1,8 @@
 {pkgs, ...}: {
-  imports = [../common.nix];
+  imports = [
+    ../../home/common.nix
+    ../../home/helide
+  ];
 
   home = {
     username = "tyler";