From afac2d99cbc3021886a58ffa62253fd14930d622 Mon Sep 17 00:00:00 2001
From: Patrick Neff <odie86@gmail.com>
Date: Sun, 14 Apr 2024 17:06:52 +0200
Subject: [PATCH] update inputs

---
 flake.lock                                   | 24 ++++++++++----------
 flake.nix                                    |  8 +++----
 lib/mkHomeConfiguration.nix                  |  9 +++++++-
 profiles/nixos/vm/hardware-configuration.nix |  2 +-
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0f2d56f..f4a09f3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -365,11 +365,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712462372,
-        "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
+        "lastModified": 1713077896,
+        "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
+        "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0",
         "type": "github"
       },
       "original": {
@@ -409,11 +409,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1712963920,
-        "narHash": "sha256-5Rh+bUrpeQLYtvnFlMFmUFkV/H6b+I22Bei8oNa+dBw=",
+        "lastModified": 1713051308,
+        "narHash": "sha256-DaaiUHENmPl1vPrQIJY7sl/LspPBQ/XiLIVeLfqpkKw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "66220d164a40791a5131d4660e6ffbee431070d5",
+        "rev": "a92822835521574710a830a7de0e692bf7517fb8",
         "type": "github"
       },
       "original": {
@@ -434,11 +434,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712966609,
-        "narHash": "sha256-XkNBbh8x1niHtVILUiNlGJHN9N2JkY+a8MR8w0/mhrI=",
+        "lastModified": 1713053047,
+        "narHash": "sha256-x17vugcgPuF+w5MpeYUbOlmUw/8tz7W4UetHKCode0E=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "c83e531b908c1fe71a95830bbad6db8a1e5b5b6b",
+        "rev": "8fa4fbe03aa7475441dd1b9c62e36feea083bfb0",
         "type": "github"
       },
       "original": {
@@ -593,11 +593,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1713038713,
-        "narHash": "sha256-xijgNVqLYXUbpSsGXh7bzx6zCRVf+WGlTcGMG04mQjA=",
+        "lastModified": 1713087347,
+        "narHash": "sha256-RpRIJcbAjR3SF6tarvdG0ErN9afifG/zjxNlntRQrw4=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "1da2087d9b8a89c310d093207afd41114d6727e1",
+        "rev": "ad6a08b69528fdaf7e12c90da06f9a34f32d7ea6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 80c5f8f..cc301d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,13 +86,13 @@
       };
       homeConfigurations =
         flakeLib.mkHomeConfiguration {
-          inherit inputs outputs nixpkgs flakeLib vars overlays;
-          profile = "odie@wanaheim";
+          inherit inputs outputs nixpkgs flakeLib overlays;
+          vars = vars // {hostName = "wanaheim"; };
           system = "x86_64-linux";
         }
         // flakeLib.mkHomeConfiguration {
-          inherit inputs outputs nixpkgs flakeLib vars overlays;
-          profile = "odie@asgard";
+          inherit inputs outputs nixpkgs flakeLib overlays;
+          vars = vars // {hostName = "asgard"; };
           system = "x86_64-linux";
         };
     }
diff --git a/lib/mkHomeConfiguration.nix b/lib/mkHomeConfiguration.nix
index d2ab9c7..b237e0a 100644
--- a/lib/mkHomeConfiguration.nix
+++ b/lib/mkHomeConfiguration.nix
@@ -1,7 +1,10 @@
 moduleInputs @ {
+  nixpkgs,
   inputs,
   flakeLib,
+  system,
   vars,
+  overlays,
   ...
 }: let
   inherit (vars) username hostName;
@@ -9,9 +12,13 @@ moduleInputs @ {
 in {
   ${profile} = let
     config = flakeLib.mkHomeManagerDefaults moduleInputs;
+    pkgs = flakeLib.mkPkgs {
+      inherit nixpkgs system overlays;
+    };
   in
     inputs.home-manager.lib.homeManagerConfiguration {
-      inherit (config) extraSpecialArgs pkgs useGlobalPkgs useUserPackages system;
+      inherit pkgs;
+      inherit (config) extraSpecialArgs;
 
       modules = [
         ../profiles/home-manager/${profile}/home.nix
diff --git a/profiles/nixos/vm/hardware-configuration.nix b/profiles/nixos/vm/hardware-configuration.nix
index d863052..54cebba 100644
--- a/profiles/nixos/vm/hardware-configuration.nix
+++ b/profiles/nixos/vm/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports =