From f28ccbf45d1276f78f23b6be9340765e8e7ef224 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 29 Mar 2025 23:24:59 +0000
Subject: [PATCH] Move shared Home Manager configuration

---
 home/opdavies/default.nix   | 14 +-------------
 home/opdavies/home.nix      | 13 +++++++++++++
 lib/shared/home-manager.nix | 24 ------------------------
 3 files changed, 14 insertions(+), 37 deletions(-)
 create mode 100644 home/opdavies/home.nix
 delete mode 100644 lib/shared/home-manager.nix

diff --git a/home/opdavies/default.nix b/home/opdavies/default.nix
index 35d8caf4..9e6844ca 100644
--- a/home/opdavies/default.nix
+++ b/home/opdavies/default.nix
@@ -30,18 +30,6 @@ let
 
   inherit (pkgs) lib;
 
-  shared-config = import "${self}/lib/shared/home-manager.nix" {
-    inherit
-      config
-      hostname
-      inputs
-      lib
-      pkgs
-      self
-      username
-      ;
-  };
-
   shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
     inherit
       headless
@@ -55,7 +43,7 @@ in
   imports =
     [
       ../common
-      shared-config
+      ./home.nix
       ./modules
     ]
     ++ pkgs.lib.optionals (!headless) [
diff --git a/home/opdavies/home.nix b/home/opdavies/home.nix
new file mode 100644
index 00000000..4e56aeda
--- /dev/null
+++ b/home/opdavies/home.nix
@@ -0,0 +1,13 @@
+{ config, ... }:
+
+{
+  home.username = "opdavies";
+  home.homeDirectory = "/home/${config.home.username}";
+
+  home.stateVersion = "22.05";
+
+  programs.home-manager.enable = true;
+
+  # Nicely reload system units when changing configs.
+  systemd.user.startServices = "sd-switch";
+}
diff --git a/lib/shared/home-manager.nix b/lib/shared/home-manager.nix
deleted file mode 100644
index 1c1be627..00000000
--- a/lib/shared/home-manager.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ username, ... }:
-
-{
-  home.username = "${username}";
-  home.homeDirectory = "/home/${username}";
-
-  # Nicely reload system units when changing configs.
-  systemd.user.startServices = "sd-switch";
-
-  # See https://github.com/nix-community/home-manager/issues/2064#issuecomment-2259307514.
-  # This is a workaround for the following errors that appeared when switching back to unstable:
-  # - 1: Failed to start unit flameshot.service
-  # - 2: org.freedesktop.systemd1.NoSuchUnit: Unit tray.target not found.
-  systemd.user.targets.tray = {
-    Unit = {
-      Description = "Home Manager System Tray";
-      Requires = [ "graphical-session-pre.target" ];
-    };
-  };
-
-  home.stateVersion = "22.05";
-
-  programs.home-manager.enable = true;
-}