mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-03-30 14:21:51 +02:00
fix: can't use nixpkgs.config and nixpkgs.pkgs at the same time, and other renames
This commit is contained in:
@@ -17,7 +17,11 @@ in
|
||||
darwin-modules
|
||||
++ [
|
||||
({lib, ...}: {
|
||||
nixpkgs.pkgs = import nixpkgs-darwin {inherit system;};
|
||||
nixpkgs.pkgs = import nixpkgs-darwin {
|
||||
inherit system; # refer the `system` parameter form outer scope recursively
|
||||
# To use chrome, we need to allow the installation of non-free software
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
})
|
||||
]
|
||||
++ (
|
||||
|
||||
@@ -12,12 +12,6 @@
|
||||
#
|
||||
###################################################################################
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Auto upgrade the nix-daemon service.
|
||||
services.nix-daemon.enable = true;
|
||||
|
||||
# Disable auto-optimise-store because of this issue:
|
||||
# https://github.com/NixOS/nix/issues/7273
|
||||
# "error: cannot link '/nix/store/.tmp-link-xxxxx-xxxxx' to '/nix/store/.links/xxxx': File exists"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
###################################################################################
|
||||
{
|
||||
# Add ability to used TouchID for sudo authentication
|
||||
security.pam.enableSudoTouchIdAuth = true;
|
||||
security.pam.services.sudo_local.touchIdAuth = true;
|
||||
|
||||
time.timeZone = "Asia/Shanghai";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user