starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-04-27 11:17:03 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: set users.users.<name>.home for darwin system, bump home-manager to branch release-23.05

Browse Source
This commit is contained in:
admin
2023-06-01 10:40:11 +08:00
committed by ryan4yin
parent dd2040568d
commit 0d53bea851
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@@ -239,17 +239,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684596126, "lastModified": 1685108129,
"narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=", "narHash": "sha256-6Jv6LxrLfaueHj095oBUKBk++eW4Ya0qfHwhQVQqyoo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "27ef11f0218d9018ebb2948d40133df2b1de622d", "rev": "bec196cd9b5f34213c7dc90ef2a524336df70e30",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "27ef11f0218d9018ebb2948d40133df2b1de622d", "rev": "bec196cd9b5f34213c7dc90ef2a524336df70e30",
"type": "github" "type": "github"
} }
}, },

5
flake.nix
View File

@@ -51,10 +51,7 @@
# home-manager, used for managing user configuration # home-manager, used for managing user configuration
home-manager = { home-manager = {
# lock to the commit at 2023-05-20, to avoid breaking changes for darwin url = "github:nix-community/home-manager/release-23.05";
# TODO error when using the master branch of home-manager:
# Error: HOME is set to "/Users/admin" but we expect "/var/empty"
url = "github:nix-community/home-manager/27ef11f0218d9018ebb2948d40133df2b1de622d";
# The `follows` keyword in inputs is used for inheritance. # The `follows` keyword in inputs is used for inheritance.
# Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake, # Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake,
# to avoid problems caused by different versions of nixpkgs dependencies. # to avoid problems caused by different versions of nixpkgs dependencies.

2
home/darwin/default.nix
View File

@@ -19,7 +19,7 @@
home = { home = {
username = "admin"; username = "admin";
# set homeDirectory make build fail # set homeDirectory make build fail
# homeDirectory = "/Users/admin"; homeDirectory = "/Users/admin";
# This value determines the Home Manager release that your # This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage # configuration is compatible with. This helps avoid breakage

6
modules/darwin/core.nix
View File

@@ -58,4 +58,10 @@
]; ];
}; };
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.admin = {
home = "/Users/admin";
description = "admin";
};
} }

1
modules/nixos/user_group.nix
View File

@@ -8,6 +8,7 @@
}; };
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.ryan = { users.users.ryan = {
home = "/home/ryan";
isNormalUser = true; isNormalUser = true;
description = "ryan"; description = "ryan";
extraGroups = [ "ryan" "users" "networkmanager" "wheel" "docker" "wireshark" "adbusers" ]; extraGroups = [ "ryan" "users" "networkmanager" "wheel" "docker" "wireshark" "adbusers" ];