Merge #211
211: home-manager fixes r=nrdxp a=nrdxp - [x] integrate nix-community/home-manager#1880 (to avoid duplicate commits, we'll wait a bit to see if this gets merged) - [x] don't use all of `systemPackages` for `flk home` - [x] test home-manager `activationPackage` and `flk home` as part of CI Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
This commit is contained in:
commit
00759997ab
|
@ -118,11 +118,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1616318638,
|
"lastModified": 1616724076,
|
||||||
"narHash": "sha256-E6ABXtzw6bHmrIirB1sJL6S2MEa3sfcvRLzRa92frCo=",
|
"narHash": "sha256-SwbPXLjN2sLy4NL/GhodiJrdkIVZwGGTGiCN3JxH1cU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ddcd476603dfd3388b1dc8234fa9d550156a51f5",
|
"rev": "fedfd430f96695997b3eaf8d7e82ca79406afa23",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -80,7 +80,6 @@ lib.nixosSystem (args // {
|
||||||
home-manager.useUserPackages = lib.mkForce false;
|
home-manager.useUserPackages = lib.mkForce false;
|
||||||
home-manager.sharedModules = [
|
home-manager.sharedModules = [
|
||||||
{
|
{
|
||||||
home.packages = config.environment.systemPackages;
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
inherit (config.environment.sessionVariables) NIX_PATH;
|
inherit (config.environment.sessionVariables) NIX_PATH;
|
||||||
};
|
};
|
||||||
|
|
|
@ -41,6 +41,8 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
homeTest = self.homeConfigurations."nixos@NixOS".home.activationPackage;
|
||||||
|
|
||||||
libTests = pkgs.runCommandNoCC "devos-lib-tests"
|
libTests = pkgs.runCommandNoCC "devos-lib-tests"
|
||||||
{
|
{
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
Loading…
Reference in a new issue