haak/dotfiles
1
0
Fork 0
Code Issues Pull requests Wiki Activity Actions

Fix an issue with darwin/home-manager expectatins for home directory

Browse source
This commit is contained in:
Haak Saxberg 2023-05-30 12:18:20 -07:00
parent 111313283f
commit cdc8897467
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home/universal.nix
View file

@ -29,7 +29,7 @@ with builtins;
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
home.username = "haak"; home.username = "haak";
home.homeDirectory = "/home/haak"; home.homeDirectory = if pkgs.stdenv.isDarwin then "/Users/haak/" else "/home/haak";
home.stateVersion = "22.05"; home.stateVersion = "22.05";
# no need for home-manager news, thanks # no need for home-manager news, thanks

4
nix/system/worktop/darwin-configuration.nix
View file

@ -71,6 +71,10 @@ in
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
# have to do this to play nicely with home-manager:
# https://github.com/nix-community/home-manager/issues/4026
users.users.haak.home = "/Users/haak";
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true; services.nix-daemon.enable = true;
# nix.package = pkgs.nix; # nix.package = pkgs.nix;