fix: revert home-manager to avoid breaking changes

This commit is contained in:
admin
2023-06-01 10:08:33 +08:00
parent 89d8acd8eb
commit dd2040568d
2 changed files with 12 additions and 9 deletions

14
flake.lock generated
View File

@@ -50,16 +50,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684774948, "lastModified": 1685559570,
"narHash": "sha256-hJTaw4dYzcB+lsasKejnafq0CxPsVetn9RLXrcL+4jE=", "narHash": "sha256-MNIQvLRoq92isMLR/ordKNCl+aXNiuwBM4QyqmS8d00=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "b8c286c82c6b47826a6c0377e7017052ad91353c", "rev": "4338bc869e9874d54a4c89539af72f16666b2abe",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lnl7", "owner": "lnl7",
"ref": "master",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@@ -240,16 +239,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685480784, "lastModified": 1684596126,
"narHash": "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=", "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "54a9d6456eaa6195998a0f37bdbafee9953ca0fb", "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "27ef11f0218d9018ebb2948d40133df2b1de622d",
"type": "github" "type": "github"
} }
}, },

View File

@@ -40,7 +40,7 @@
# for macos # for macos
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.05-darwin";
darwin = { darwin = {
url = "github:lnl7/nix-darwin/master"; url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs-darwin"; inputs.nixpkgs.follows = "nixpkgs-darwin";
}; };
@@ -51,7 +51,10 @@
# home-manager, used for managing user configuration # home-manager, used for managing user configuration
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; # lock to the commit at 2023-05-20, to avoid breaking changes for darwin
# 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.