divnix/digga
1
1
Fork 0
mirror of https://github.com/divnix/digga.git synced 2024-12-22 23:51:39 +03:00
Code Issues Projects Releases Wiki Activity

Update home-manager to 22.11

Browse Source 
This commit updates the home-manager flake input to the 22.11 release
and creates additional support for the new homeManagerConfiguration
setup that is introduced there: Some arguments that were previously
in use, now need to be used inside the new modules argument (check
[here][hm-22.11-highlights] for more details).

Finally, the examples of using home-manager now declare explicitly the
stateVersion, since the 22.11 release makes this mandatory.

[hm-22.11-highlights]: https://nix-community.github.io/home-manager/release-notes.html#sec-release-22.11-highlights
This commit is contained in:
Yannis Koutras 2022-12-08 11:35:57 +01:00 committed by David Arnold
parent 504459e184
commit bca4b89f49
10 changed files with 108 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/devos/flake.lock
View File

@ -271,19 +271,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ],
"utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1672244468,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -447,6 +448,21 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

14
examples/devos/flake.nix
View File

@ -36,7 +36,7 @@
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
digga.inputs.deploy.follows = "deploy"; digga.inputs.deploy.follows = "deploy";
home.url = "github:nix-community/home-manager/release-22.05"; home.url = "github:nix-community/home-manager/release-22.11";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
@ -196,8 +196,16 @@
# it could just be left to the developer to determine what's # it could just be left to the developer to determine what's
# appropriate. after all, configuring these hm users is one of the # appropriate. after all, configuring these hm users is one of the
# first steps in customizing the template. # first steps in customizing the template.
nixos = {suites, ...}: {imports = suites.base;}; nixos = {suites, ...}: {
darwin = {suites, ...}: {imports = suites.base;}; imports = suites.base;
home.stateVersion = "22.11";
};
darwin = {suites, ...}: {
imports = suites.base;
home.stateVersion = "22.11";
};
}; # digga.lib.importers.rakeLeaves ./users/hm; }; # digga.lib.importers.rakeLeaves ./users/hm;
}; };

26
examples/groupByConfig/flake.lock
View File

@ -199,19 +199,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ],
"utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1672244468,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -338,6 +339,21 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

2
examples/groupByConfig/flake.nix
View File

@ -19,7 +19,7 @@
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs-darwin-stable"; darwin.inputs.nixpkgs.follows = "nixpkgs-darwin-stable";
home.url = "github:nix-community/home-manager/release-22.05"; home.url = "github:nix-community/home-manager/release-22.11";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
}; };

26
examples/hmOnly/flake.lock
View File

@ -181,19 +181,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
] ],
"utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1672244468,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -266,6 +267,21 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

2
examples/hmOnly/flake.nix
View File

@ -6,7 +6,7 @@
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";
home.url = "github:nix-community/home-manager/release-22.05"; home.url = "github:nix-community/home-manager/release-22.11";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
}; };

5
examples/hmOnly/home/users/testuser.nix
View File

@ -8,7 +8,10 @@
in { in {
imports = suites.shell; imports = suites.shell;
home.packages = [pkgs.hello]; home = {
packages = [pkgs.hello];
stateVersion = "22.11";
};
programs.browserpass.enable = true; programs.browserpass.enable = true;
programs.starship.enable = true; programs.starship.enable = true;

11
flake.lock
View File

@ -150,19 +150,22 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixlib" "nixlib"
],
"utils": [
"flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1672244468,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }

3
flake.nix
View File

@ -15,8 +15,9 @@
deploy.url = "github:serokell/deploy-rs"; deploy.url = "github:serokell/deploy-rs";
deploy.inputs.nixpkgs.follows = "nixpkgs"; deploy.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-22.05"; home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixlib"; home-manager.inputs.nixpkgs.follows = "nixlib";
home-manager.inputs.utils.follows = "flake-utils";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";

31
src/mkFlake/outputs-builder.nix
View File

@ -27,20 +27,27 @@
homeDirectory = "${homeDirectoryPrefix}/${username}"; homeDirectory = "${homeDirectoryPrefix}/${username}";
in in
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
inherit username homeDirectory pkgs system; inherit pkgs;
modules =
config.home.modules
++ config.home.exportedModules
++ [
({
imports = [configuration];
home = {
inherit username homeDirectory;
};
}
// (
if (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin)
then {targets.genericLinux.enable = true;}
else {}
))
];
extraModules = config.home.modules ++ config.home.exportedModules;
extraSpecialArgs = config.home.importables // {inherit self inputs;}; extraSpecialArgs = config.home.importables // {inherit self inputs;};
configuration =
{
imports = [configuration];
}
// (
if (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin)
then {targets.genericLinux.enable = true;}
else {}
);
}; };
homeConfigurationsPortable = homeConfigurationsPortable =