From acf451a1c99ee6c2aa84f1280762d504d8dbc3be Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Tue, 8 Oct 2024 10:53:44 +0100
Subject: [PATCH] tohru: move qenya home-manager config into default.nix

---
 hosts/tohru/default.nix | 15 ++++++++++++++-
 hosts/tohru/home.nix    | 16 ----------------
 2 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 hosts/tohru/home.nix

diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index 2a183f5..8d6f7b2 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -30,7 +30,20 @@
     "networkmanager" # UI wifi configuration
     "dialout" # access to serial ports
   ];
-  home-manager.users.qenya.imports = [ ./home.nix ];
+  home-manager.users.qenya = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      keepassxc
+      amberol
+      foliate
+      nicotine-plus
+
+      # games
+      openttd
+      prismlauncher
+      nur.repos.qenya.digital-a-love-story
+      nur.repos.qenya.dont-take-it-personally-babe
+    ];
+  };
 
   programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
   programs.steam.enable = true;
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
deleted file mode 100644
index f1a62ba..0000000
--- a/hosts/tohru/home.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    keepassxc
-    amberol
-    foliate
-    nicotine-plus
-
-    # games
-    openttd
-    prismlauncher
-    nur.repos.qenya.digital-a-love-story
-    nur.repos.qenya.dont-take-it-personally-babe
-  ];
-}