mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

users/jan: use mkmerge for nixpkgs overlays

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2022-10-10 07:52:41 +03:00
parent 5ad41a6a08
commit 7b09b44d3e
Signed by: pleshevskiy
GPG key ID: 1B59187B161C0215
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -59,6 +59,11 @@
${nixos-rebuild}/bin/nixos-rebuild switch --flake .#${hostname} ${nixos-rebuild}/bin/nixos-rebuild switch --flake .#${hostname}
'') '')
self.nixosConfigurations); self.nixosConfigurations);
test = lib.recurseIntoAttrs (lib.mapAttrs
(hostname: machine: pkgs.writeShellScript "test-${hostname}" ''
${nixos-rebuild}/bin/nixos-rebuild test --flake .#${hostname}
'')
self.nixosConfigurations);
}); });
devShells = { devShells = {

15
users/jan/default.nix
View file

@ -2,12 +2,15 @@
let secrets = import ./secrets.nix; in let secrets = import ./secrets.nix; in
{ {
nixpkgs.overlays = lib.mkAfter ((import ../../overlays) ++ [ nixpkgs.overlays = lib.mkMerge [
inputs.wired.overlays.default (lib.mkBefore (import ../../overlays))
inputs.myneovim.overlays.default (lib.mkAfter [
inputs.vnetod.overlay inputs.wired.overlays.default
inputs.nil.overlays.default inputs.myneovim.overlays.default
]); inputs.vnetod.overlay
inputs.nil.overlays.default
])
];
users.users.jan = { users.users.jan = {
isNormalUser = true; isNormalUser = true;