From f4ff5a6251d930d6d67d27cc194283f00908da6e Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Tue, 8 Jul 2025 01:10:59 -0400
Subject: [PATCH] remove lix, add homes to hydra

---
 flake.lock           | 56 --------------------------------------------
 flake.nix            | 14 +++++------
 hydra/jobs.nix       |  8 +++++++
 lib/systems.nix      |  2 +-
 users/alice/home.nix |  1 +
 5 files changed, 17 insertions(+), 64 deletions(-)

diff --git a/flake.lock b/flake.lock
index e8b0605..e700b84 100644
--- a/flake.lock
+++ b/flake.lock
@@ -178,21 +178,6 @@
         "type": "github"
       }
     },
-    "flakey-profile": {
-      "locked": {
-        "lastModified": 1712898590,
-        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lf-",
-        "repo": "flakey-profile",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -358,46 +343,6 @@
         "type": "github"
       }
     },
-    "lix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1737234286,
-        "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=",
-        "rev": "079528098f5998ba13c88821a2eca1005c1695de",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
-      }
-    },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "flakey-profile": "flakey-profile",
-        "lix": "lix",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741892773,
-        "narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=",
-        "ref": "stable",
-        "rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911",
-        "revCount": 130,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      },
-      "original": {
-        "ref": "stable",
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/nixos-module"
-      }
-    },
     "nix": {
       "flake": false,
       "locked": {
@@ -660,7 +605,6 @@
         "home-manager": "home-manager",
         "hydra": "hydra",
         "hyprland-contrib": "hyprland-contrib",
-        "lix-module": "lix-module",
         "nix-index-database": "nix-index-database",
         "nixos-cosmic": "nixos-cosmic",
         "nixos-generators": "nixos-generators",
diff --git a/flake.nix b/flake.nix
index 427fcdd..16bb675 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,13 +66,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    lix-module = {
-      url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
+    #lix-module = {
+    #  url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable";
+    #  inputs = {
+    #    nixpkgs.follows = "nixpkgs";
+    #    flake-utils.follows = "flake-utils";
+    #  };
+    #};
 
     nix-index-database = {
       url = "github:Mic92/nix-index-database";
diff --git a/hydra/jobs.nix b/hydra/jobs.nix
index e8d9279..6fbc994 100644
--- a/hydra/jobs.nix
+++ b/hydra/jobs.nix
@@ -10,6 +10,9 @@ let
   getCfg = _: cfg: cfg.config.system.build.toplevel;
   hostToAgg = _: cfg: cfg;
 
+  getHome = _: cfg: cfg.config.home.activationPackage;
+  homeToAgg = _: cfg: cfg;
+
   # get per-system check derivation (with optional postfix)
   mapSystems =
     {
@@ -22,11 +25,16 @@ rec {
   inherit (outputs) formatter devShells checks;
 
   host = lib.mapAttrs getCfg outputs.nixosConfigurations;
+  home = lib.mapAttrs getHome outputs.homeConfigurations; # homeConfigurations.alice.config.home.activationPackage
 
   hosts = pkgs.releaseTools.aggregate {
     name = "hosts";
     constituents = lib.mapAttrsToList hostToAgg host;
   };
+  homes = pkgs.releaseTools.aggregate {
+    name = "homes";
+    constituents = lib.mapAttrsToList homeToAgg home;
+  };
 
   devChecks = pkgs.releaseTools.aggregate {
     name = "devChecks";
diff --git a/lib/systems.nix b/lib/systems.nix
index ba894b7..09136b4 100644
--- a/lib/systems.nix
+++ b/lib/systems.nix
@@ -182,7 +182,7 @@ rec {
         ++ genWrapper sops genSops args
         ++ genWrapper home genHome args
         ++ genWrapper true genUsers args
-        ++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args
+        #++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args
         ++ genWrapper (system != "x86_64-linux") genNonX86 args;
     };
 
diff --git a/users/alice/home.nix b/users/alice/home.nix
index 3e005a9..85c98b8 100644
--- a/users/alice/home.nix
+++ b/users/alice/home.nix
@@ -76,6 +76,7 @@
       nix-prefetch
       nix-tree
       nh
+      home-manager
 
       # doom emacs dependencies
       fd