dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update nixpkgs and home-manager

Browse Source 
And fix weird nixpkgs config behaviour
This commit is contained in:
Jack O'Sullivan 2022-05-07 15:12:29 +01:00
parent 39f8e65f74
commit 1a61c9e1b2
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@ -136,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1650784624, "lastModified": 1651886851,
"narHash": "sha256-RTYGFBlxEmhhLLH9UfObyz2d4alhCSf6NQpyID7Mqvg=", "narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "65a32578d9b1394bea5c6336721ec392aadc89fb", "rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
}, },
"nixpkgs-mine": { "nixpkgs-mine": {
"locked": { "locked": {
"lastModified": 1651402344, "lastModified": 1651928992,
"narHash": "sha256-l+gdIawjIP4W/a8uyFjzCAtHj+/4MiVAFtU3KqRJB2Q=", "narHash": "sha256-U9IgIFKj1W6YBsoFy3AG7YaxBw9qQTYeGhvlLcKfUYQ=",
"owner": "devplayer0", "owner": "devplayer0",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e63fb067c84f90b2285650ea994123cbe91d3a30", "rev": "e0844396c59d27f26f18b8ee4bff4fdda0e39cfa",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
home-manager/default.nix
View File

@ -18,8 +18,10 @@ let
configuration = head defs; configuration = head defs;
# Passing pkgs here doesn't set the global pkgs, just where it'll be imported from (and where the global lib is # Passing pkgs here doesn't set the global pkgs, just where it'll be imported from (and where the global lib is
# derived from). We want home-manager to import pkgs itself so it'll apply config and overlays modularly. Any config # derived from). We want home-manager to import pkgs itself so it'll apply config and overlays modularly. Any config
# and overlays previously applied will be passed on by `homeManagerConfiguration` though. # and overlays previously applied will be passed on by `homeManagerConfiguration` though. In fact, because of weird
pkgs = pkgs'.${config'.nixpkgs}.${config'.system}; # config merging behaviour (or lack thereof; similar to NixOS module), we explicitly pass empty config.
# TODO: Check if this is fixed in future.
pkgs = pkgs'.${config'.nixpkgs}.${config'.system} // { config = { }; };
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
extraModules = (attrValues cfg.modules) ++ [ extraModules = (attrValues cfg.modules) ++ [
{ {

2
home-manager/modules/common.nix
View File

@ -232,7 +232,7 @@ in
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
pkgs'.unstable.nixVersions.stable pkgs'.mine.nix
]; ];
}; };
}) })

8
nixos/default.nix
View File

@ -60,9 +60,11 @@ let
networking.hostName = mkDefault name; networking.hostName = mkDefault name;
nixpkgs = { nixpkgs = {
inherit (config') system; inherit (config') system;
# Make sure any previously set config / overlays (e.g. lib which will be inherited by home-manager down the # Make sure any previously set overlays (e.g. lib which will be inherited by home-manager down the
# line) are passed on when nixpkgs is imported. # line) are passed on when nixpkgs is imported. We don't inherit config anymore because apparently it
inherit (pkgs) config overlays; # doesn't seem to merge properly... (https://github.com/NixOS/nixpkgs/blob/14a348fcc6c0d28804f640375f058d5491c2e1ee/nixos/modules/misc/nixpkgs.nix#L34)
# TODO: Possible this behaviour will be fixed in future?
inherit (pkgs) overlays;
}; };
# Unfortunately it seems there's no way to fully decouple home-manager's lib from NixOS's pkgs.lib. :( # Unfortunately it seems there's no way to fully decouple home-manager's lib from NixOS's pkgs.lib. :(

2
nixos/modules/common.nix
View File

@ -47,7 +47,7 @@ in
}; };
nix = { nix = {
package = pkgs'.unstable.nixVersions.stable; package = pkgs'.mine.nix;
# TODO: This has been renamed to nix.settings.trusted-users in 22.05 # TODO: This has been renamed to nix.settings.trusted-users in 22.05
trustedUsers = [ "@wheel" ]; trustedUsers = [ "@wheel" ];
extraOptions = extraOptions =