feat: let home-manager manage its own overlays

modules/base/home.nix

@@ -16,7 +16,6 @@ in {
 
     home-manager = {
       useUserPackages = true;
-      useGlobalPkgs = true;
       backupFileExtension = "bak";
 
       users."${my.name}" = {

modules/base/nix.nix

@@ -50,18 +50,7 @@
       };
     };
 
-    nixpkgs = {
+    nixpkgs = import ./nixpkgs.nix {inherit inputs;};
-      config = {
-        allowUnfree = true;
-      };
-
-      overlays = [
-        inputs.nur.overlays.default
-
-        # Custom packages
-        (import ../../overlays/marleyos.nix)
-      ];
-    };
 
     # More useful repl.
     environment.systemPackages = let

modules/base/nixpkgs.nix

@@ -0,0 +1,12 @@
+{inputs, ...}: {
+  config = {
+    allowUnfree = true;
+  };
+
+  overlays = [
+    inputs.nur.overlays.default
+
+    # Custom packages.
+    (import ../../overlays/marleyos.nix)
+  ];
+}

modules/base/programs/neovim.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  inputs,
   pkgs,
   ...
 }: let
@@ -10,11 +9,6 @@ in {
   options.marleyos.programs.neovim.enable = lib.mkEnableOption "neovim";
 
   config = lib.mkIf cfg.enable {
-    # Has to be applied on the OS level to use in HM.
-    nixpkgs.overlays = [
-      (import ../../../overlays/marleyvim.nix {inherit inputs;})
-    ];
-
     environment.systemPackages = with pkgs; [
       neovim
     ];

modules/home/default.nix

@@ -5,6 +5,7 @@
     ./options
 
     ./home-manager.nix
+    ./nix.nix
 
     ./system
     ./shell

modules/home/nix.nix

@@ -0,0 +1,3 @@
+{inputs, ...}: {
+  config.nixpkgs = import ../base/nixpkgs.nix {inherit inputs;};
+}

modules/home/programs/neovim.nix

@@ -3,6 +3,7 @@
   config,
   osConfig,
   lib,
+  inputs,
   pkgs,
   ...
 }: let
@@ -15,6 +16,10 @@ in {
     mkEnableOption' "neovim" osCfg.enable;
 
   config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [
+      (import ../../../overlays/marleyvim.nix {inherit inputs;})
+    ];
+
     home.packages = with pkgs; [
       nvim
     ];