From 531d8dde370bdca7c69c1e49667ee90b7555bd05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 8 Oct 2023 16:40:16 +0300
Subject: [PATCH] hm: fix bugs when overriding things

---
 modules/base/users/default.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix
index 2e5550e..93af6d6 100644
--- a/modules/base/users/default.nix
+++ b/modules/base/users/default.nix
@@ -61,18 +61,21 @@ in {
 
     home-manager.useGlobalPkgs = true;
     home-manager.users.motiejus = {pkgs, ...}:
-      import ../../../shared/home/default.nix {
-        inherit pkgs;
-        inherit (config.mj) stateVersion;
-        email = "motiejus@jakstys.lt";
-
-        programs.bash = {
-          enable = true;
-          shellAliases = {
-            "l" = "echo -n ł | xclip -selection clipboard";
-            "gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
+      lib.mkMerge [
+        (import ../../../shared/home/default.nix {
+          inherit pkgs;
+          inherit (config.mj) stateVersion;
+          email = "motiejus@jakstys.lt";
+        })
+        {
+          programs.bash = {
+            enable = true;
+            shellAliases = {
+              "l" = "echo -n ł | xclip -selection clipboard";
+              "gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
+            };
           };
-        };
-      };
+        }
+      ];
   };
 }