From 637042c243b76c67f5bbb8617e334a660bc5b4ef Mon Sep 17 00:00:00 2001 From: Natalie Date: Sat, 19 Apr 2025 11:04:56 -0700 Subject: [PATCH] try to fix username in home manager --- hosts/laptop/home.nix | 2 ++ lib/mkSystem.nix | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 9a4950b..e4ffe3f 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -3,11 +3,13 @@ config, pkgs, lib, + currentSystemUser, ... }: { programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib;}; home = { + username = currentSystemUser; homeDirectory = "/Users/nmarks/"; # Home Manager needs a bit of information about you and the paths it should # manage. diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index 0bb91cf..e8fe62e 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -30,6 +30,11 @@ hostConfig = ../hosts/${host}/configuration.nix; homeConfig = ../hosts/${host}/home.nix; + homeDir = + if darwin + then "/Users/nmarks/" + else "/home/nmarks"; + # NixOS vs nix-darwin functions systemFunc = if darwin