From da6dffbcff95946fc0681c2f9f8db2c04a084b00 Mon Sep 17 00:00:00 2001 From: hexchen Date: Sat, 2 Jan 2021 09:01:17 +0000 Subject: [PATCH] common: move sources to external.nix --- configuration/common/default.nix | 10 ++-------- configuration/common/{pbb.nix => external.nix} | 7 ++++++- 2 files changed, 8 insertions(+), 9 deletions(-) rename configuration/common/{pbb.nix => external.nix} (73%) diff --git a/configuration/common/default.nix b/configuration/common/default.nix index b618a68..9083704 100644 --- a/configuration/common/default.nix +++ b/configuration/common/default.nix @@ -1,15 +1,9 @@ { config, lib, pkgs, ... }: -let - home-manager = fetchGit { - url = "https://github.com/nix-community/home-manager"; - rev = "a98ec6ec158686387d66654ea96153ec06be33d7"; - }; -in { +{ imports = [ ../../modules - "${home-manager}/nixos" - ./pbb.nix + ./external.nix ./users.nix ]; diff --git a/configuration/common/pbb.nix b/configuration/common/external.nix similarity index 73% rename from configuration/common/pbb.nix rename to configuration/common/external.nix index 77eb1eb..b072ca2 100644 --- a/configuration/common/pbb.nix +++ b/configuration/common/external.nix @@ -1,7 +1,7 @@ let pbb-nixfiles = fetchGit { url = "https://git.petabyte.dev/petabyteboy/nixfiles"; - rev = "ac4f83ecdc2ff1794223c0485ab749cbe399e802"; + rev = "b15d29e0440716fc37414547d55839717c9ed2f9"; }; qyliss-nixlib = fetchTarball { @@ -9,9 +9,14 @@ let sha256 = "0nan14ixhdzxxddnckqqhaxhr96yw08rgcmxssddhji6aq5a445j"; }; + home-manager = fetchGit { + url = "https://github.com/nix-community/home-manager"; + rev = "a98ec6ec158686387d66654ea96153ec06be33d7"; + }; in { imports = [ (pbb-nixfiles + "/modules") + (home-manager + "/nixos") ]; nixpkgs.overlays = [