From 427ee669c5a01abdfdbb834bb2b06befc8ef1c69 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 30 Jan 2023 01:53:59 +0000
Subject: [PATCH] refactor: home.packages: move out of home-manager

---
 hosts/common/users.nix           | 2 ++
 modules/home-manager/default.nix | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hosts/common/users.nix b/hosts/common/users.nix
index 73b09d05..53bd54c3 100644
--- a/hosts/common/users.nix
+++ b/hosts/common/users.nix
@@ -49,6 +49,8 @@ in
 
       shell = pkgs.zsh;
 
+      packages = builtins.map (p: p.pkg) config.sane.packages.enabledUserPkgs;
+
       # mount encrypted stuff at login
       # some other nix pam users:
       # - <https://github.com/g00pix/nixconf/blob/32c04f6fa843fed97639dd3f09e157668d3eea1f/profiles/sshfs.nix>
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index fc1a0d8d..695d4300 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -9,8 +9,6 @@
 with lib;
 let
   cfg = config.sane.home-manager;
-  # extract `pkg` from `sane.packages.enabledUserPkgs`
-  pkg-list = pkgspec: builtins.map (e: e.pkg) pkgspec;
 in
 {
   options = {
@@ -31,8 +29,6 @@ in
       manual.html.enable = false;  # TODO: set to true later (build failure)
       manual.manpages.enable = false;  # TODO: enable after https://github.com/nix-community/home-manager/issues/3344
 
-      home.packages = pkg-list config.sane.packages.enabledUserPkgs;
-
       home.stateVersion = "21.11";
       home.username = "colin";
       home.homeDirectory = "/home/colin";