From 7b09b44d3ee81a4638affe3475d3b59868be8ef2 Mon Sep 17 00:00:00 2001
From: janabhumi <dmitriy@ideascup.me>
Date: Mon, 10 Oct 2022 07:52:41 +0300
Subject: [PATCH] users/jan: use mkmerge for nixpkgs overlays

---
 flake.nix             |  5 +++++
 users/jan/default.nix | 15 +++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index c886741..b7b950d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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 = {
diff --git a/users/jan/default.nix b/users/jan/default.nix
index ac57acb..b3ef102 100644
--- a/users/jan/default.nix
+++ b/users/jan/default.nix
@@ -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;