Remove duplicate nixpkgs import from path

This commit is contained in:
Tim Schubert 2021-01-02 10:12:04 +01:00
parent f0c1441230
commit e0c49cfc27
No known key found for this signature in database
GPG key ID: 99658A3EB5CD7C13
4 changed files with 10 additions and 6 deletions

View file

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> }:
{ pkgs }:
with pkgs;
rec {

View file

@ -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" ];

View file

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
let
this = import ../../.. {};
this = import ../../.. { inherit pkgs; };
in
{
nixpkgs.overlays = [

View file

@ -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 ];