From 9d5414f614ae1e42b5eb4d512f89040a9db224ee Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Fri, 6 Jun 2025 13:39:38 +0200
Subject: [PATCH] use haumea for homeProfiles

---
 flake.nix              | 12 ++++---
 hosts/hopper/home.nix  | 20 +++++------
 hosts/nixdesk/home.nix | 80 +++++++++++++++++++++---------------------
 3 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/flake.nix b/flake.nix
index cbfb7f4..3360a91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,11 +6,13 @@
     haumea,
     ...
   } @ inputs: let
-    systemProfiles = haumea.lib.load {
-      src = ./sys/profiles;
-      loader = haumea.lib.loaders.path;
-    };
-    homeProfiles = ./home;
+    _load = path:
+      haumea.lib.load {
+        src = path;
+        loader = haumea.lib.loaders.path;
+      };
+    systemProfiles = _load ./sys/profiles;
+    homeProfiles = _load ./home;
     vars = import ./vars;
     l = nixpkgs.lib;
     b = builtins;
diff --git a/hosts/hopper/home.nix b/hosts/hopper/home.nix
index af24cb6..2657e9f 100644
--- a/hosts/hopper/home.nix
+++ b/hosts/hopper/home.nix
@@ -4,20 +4,20 @@
   pkgs,
   ...
 }: {
-  imports = map (x: homeProfiles + x) [
-    /cli/xdg.nix
-    /cli/comma.nix
+  imports = with homeProfiles; [
+    cli.xdg
+    cli.comma
 
-    /programs/nvim.nix
-    /programs/foot.nix
+    programs.nvim
+    programs.foot
 
-    /desktop/xdg-portals.nix
-    /desktop/sway/default.nix
+    desktop.xdg-portals
+    desktop.sway.default
 
-    /programs/mpv.nix
+    programs.mpv
 
-    /services/playerctl.nix
-    /services/polkit-agent.nix
+    services.playerctl
+    services.polkit-agent
   ];
 
   wayland.windowManager.sway.config.output."HDMI-A-1".scale = "2.0";
diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix
index 4dd5344..9b5459b 100644
--- a/hosts/nixdesk/home.nix
+++ b/hosts/nixdesk/home.nix
@@ -6,63 +6,63 @@
   homeProfiles,
   ...
 }: {
-  imports = map (x: homeProfiles + x) [
-    /cli/zsh.nix
-    /cli/fish.nix
+  imports = with homeProfiles; [
+    cli.zsh
+    cli.fish
 
-    /cli/xdg.nix
-    /cli/direnv.nix
-    /cli/tmux.nix
-    /cli/comma.nix
-    /cli/irssi.nix
-    /cli/git.nix
-    /cli/github.nix
-    /cli/jujutsu.nix
+    cli.xdg
+    cli.direnv
+    cli.tmux
+    cli.comma
+    cli.irssi
+    cli.git
+    cli.github
+    cli.jujutsu
 
-    /programs/nvim.nix
+    programs.nvim
 
-    /programs/firefox/default.nix
-    /programs/tor.nix
-    /programs/chromium.nix
+    programs.firefox.default
+    programs.tor
+    programs.chromium
 
-    /programs/foot.nix
+    programs.foot
 
-    /themes/dark/default.nix
+    themes.dark.default
 
     # desktop
-    /desktop/xdg-portals.nix
-    /desktop/sway/default.nix
+    desktop.xdg-portals
+    desktop.sway.default
 
     # development
-    /develop/common.nix
-    /develop/docs.nix
+    develop.common
+    develop.docs
 
-    /develop/langs/haskell.nix
-    /develop/langs/go.nix
-    /develop/langs/js.nix
-    /develop/langs/rust.nix
-    /develop/langs/elixir.nix
-    /develop/langs/nix.nix
-    /develop/langs/zig.nix
-    /develop/langs/lua.nix
-    /develop/langs/c.nix
-    /develop/langs/csharp.nix
+    develop.langs.haskell
+    develop.langs.go
+    develop.langs.js
+    develop.langs.rust
+    develop.langs.elixir
+    develop.langs.nix
+    develop.langs.zig
+    develop.langs.lua
+    develop.langs.c
+    develop.langs.csharp
 
     # programs
-    /programs/discord.nix
-    /programs/obs.nix
+    programs.discord
+    programs.obs
 
-    /programs/beets.nix
-    /programs/cmus.nix
+    programs.beets
+    programs.cmus
 
-    /programs/mpv.nix
+    programs.mpv
 
     # gaming
-    /programs/mangohud.nix
-    /programs/jc141.nix
+    programs.mangohud
+    programs.jc141
 
-    /services/playerctl.nix
-    /services/polkit-agent.nix
+    services.playerctl
+    services.polkit-agent
   ];
 
   wayland.windowManager.sway.extraConfig = ''