From d77735ec8e2002c8029814d8c02085862623ad13 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Wed, 13 Nov 2024 21:11:48 -0800
Subject: [PATCH] feat(home): Use me

---
 flake.nix        | 11 ++++++-----
 home/default.nix |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index bdfb23b..4e36957 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,6 @@
               [
                 inputs.rose-pine.homeManagerModules.rose-pine
                 "${myHomeMods}/iconTheme.nix"
-                "${myHomeMods}/me.nix"
                 "${myHomeMods}/shellAbbrs.nix"
                 "${self}/home"
               ];
@@ -37,16 +36,18 @@
         { pkgs, ... }:
         let
           me = "marley";
-          home = if pkgs.stdenv.isDarwin then "Users" else "home";
           inherit (self.nixos-unified.lib) mkHomeConfiguration;
         in
         {
           legacyPackages.homeConfigurations."${me}" = mkHomeConfiguration pkgs (
             { pkgs, ... }:
             {
-              imports = [ self.homeModules."${me}" ];
-              home.username = me;
-              home.homeDirectory = "/${home}/${me}";
+              imports = [
+                "${self}/modules/home/me.nix"
+                self.homeModules."${me}"
+              ];
+
+              me.name = me;
               home.stateVersion = "24.05";
             }
           );
diff --git a/home/default.nix b/home/default.nix
index 368769a..5d88d9e 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,6 +4,11 @@
   ...
 }:
 {
+  me = {
+    username = "punkfairie";
+    email = "marley@punkfairie.net";
+  };
+
   targets.genericLinux.enable = lib.mkIf pkgs.stdenv.isLinux true;
 
   home.language.base = "en_US.UTF-8";