users/jan: use mkmerge for nixpkgs overlays
This commit is contained in:
parent
5ad41a6a08
commit
7b09b44d3e
2 changed files with 14 additions and 6 deletions
|
@ -59,6 +59,11 @@
|
|||
${nixos-rebuild}/bin/nixos-rebuild switch --flake .#${hostname}
|
||||
'')
|
||||
self.nixosConfigurations);
|
||||
test = lib.recurseIntoAttrs (lib.mapAttrs
|
||||
(hostname: machine: pkgs.writeShellScript "test-${hostname}" ''
|
||||
${nixos-rebuild}/bin/nixos-rebuild test --flake .#${hostname}
|
||||
'')
|
||||
self.nixosConfigurations);
|
||||
});
|
||||
|
||||
devShells = {
|
||||
|
|
|
@ -2,12 +2,15 @@
|
|||
|
||||
let secrets = import ./secrets.nix; in
|
||||
{
|
||||
nixpkgs.overlays = lib.mkAfter ((import ../../overlays) ++ [
|
||||
inputs.wired.overlays.default
|
||||
inputs.myneovim.overlays.default
|
||||
inputs.vnetod.overlay
|
||||
inputs.nil.overlays.default
|
||||
]);
|
||||
nixpkgs.overlays = lib.mkMerge [
|
||||
(lib.mkBefore (import ../../overlays))
|
||||
(lib.mkAfter [
|
||||
inputs.wired.overlays.default
|
||||
inputs.myneovim.overlays.default
|
||||
inputs.vnetod.overlay
|
||||
inputs.nil.overlays.default
|
||||
])
|
||||
];
|
||||
|
||||
users.users.jan = {
|
||||
isNormalUser = true;
|
||||
|
|
Loading…
Reference in a new issue