From e0c49cfc27b67ab3d9a8ad0346bb9894b15d202e Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 2 Jan 2021 10:12:04 +0100
Subject: [PATCH] Remove duplicate nixpkgs import from path

---
 default.nix                   | 2 +-
 hosts/gorgon/default.nix      | 8 ++++++--
 hosts/gorgon/home/default.nix | 2 +-
 hosts/surgat/default.nix      | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/default.nix b/default.nix
index f565f36..8c06d4a 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> }:
+{ pkgs }:
 
 with pkgs;
 rec {
diff --git a/hosts/gorgon/default.nix b/hosts/gorgon/default.nix
index 140c99f..8cbb199 100644
--- a/hosts/gorgon/default.nix
+++ b/hosts/gorgon/default.nix
@@ -1,11 +1,15 @@
 { config, pkgs, lib, ... }:
 let
-  this = import ../.. {};
+  this = import ../.. { inherit pkgs; };
+  nixos-hardware = buildins.fetchTarball {
+    url = "https://github.com/NixOS/nixos-hardware/archive/c242378e63b0ec334e964ac0c0fbbdd2b3e89ebf.tar.gz";
+    sha256 = "1z4cr5gsyfdpcy31vqg4ikalbxmnnac6jjk1nl8mxj0h0ix7pp36";
+  };
 in
 {
   imports = (lib.attrValues this.modules) ++ [
     ../../modules/profiles/laptop
-    <nixos-hardware/lenovo/thinkpad/t14s/amd/gen1>
+    "${nixos-hardware}/lenovo/thinkpad/t14s"
   ];
 
   boot.kernelModules = [ "kvm-amd" ];
diff --git a/hosts/gorgon/home/default.nix b/hosts/gorgon/home/default.nix
index d318f42..2a55e72 100644
--- a/hosts/gorgon/home/default.nix
+++ b/hosts/gorgon/home/default.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  this = import ../../.. {};
+  this = import ../../.. { inherit pkgs; };
 in
 {
   nixpkgs.overlays = [
diff --git a/hosts/surgat/default.nix b/hosts/surgat/default.nix
index 8b91fd4..a65b731 100644
--- a/hosts/surgat/default.nix
+++ b/hosts/surgat/default.nix
@@ -1,9 +1,9 @@
 { config, pkgs, lib, ... }:
 let
   hostName = "surgat";
-  this = import ../.. {};
+  this = import ../.. { inherit pkgs; };
   keys = ../../pkgs/keys/keys;
-  homePage = self: super: { homePage = super.callPackage ../../pkgs/homePage {}; };
+  homePage = self: super: { homePage = super.callPackage ../../pkgs/homePage { }; };
 in {
   imports = [ this.profiles.base ];