From 03552df4e31da7ab07414de45d28c8f99bb3dcd2 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 27 May 2024 15:21:48 +0800 Subject: [PATCH] lib: move env-specific subsets into their own directory --- lib/{ => env-specific}/home-manager.nix | 0 lib/{ => env-specific}/nixos.nix | 0 lib/{ => env-specific}/nixvim.nix | 0 lib/{ => env-specific}/sops.nix | 0 modules/home-manager/_private/extra-arguments.nix | 4 ++-- modules/nixos/_private/extra-arguments.nix | 4 ++-- modules/nixvim/_private/extra-arguments.nix | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename lib/{ => env-specific}/home-manager.nix (100%) rename lib/{ => env-specific}/nixos.nix (100%) rename lib/{ => env-specific}/nixvim.nix (100%) rename lib/{ => env-specific}/sops.nix (100%) diff --git a/lib/home-manager.nix b/lib/env-specific/home-manager.nix similarity index 100% rename from lib/home-manager.nix rename to lib/env-specific/home-manager.nix diff --git a/lib/nixos.nix b/lib/env-specific/nixos.nix similarity index 100% rename from lib/nixos.nix rename to lib/env-specific/nixos.nix diff --git a/lib/nixvim.nix b/lib/env-specific/nixvim.nix similarity index 100% rename from lib/nixvim.nix rename to lib/env-specific/nixvim.nix diff --git a/lib/sops.nix b/lib/env-specific/sops.nix similarity index 100% rename from lib/sops.nix rename to lib/env-specific/sops.nix diff --git a/modules/home-manager/_private/extra-arguments.nix b/modules/home-manager/_private/extra-arguments.nix index 2085d87d..ceab620d 100644 --- a/modules/home-manager/_private/extra-arguments.nix +++ b/modules/home-manager/_private/extra-arguments.nix @@ -8,8 +8,8 @@ in { _module.args.foodogsquaredLib = foodogsquaredLib.extend (final: prev: { - home-manager = import ../../../lib/home-manager.nix { inherit pkgs lib; self = final; }; + home-manager = import ../../../lib/env-specific/home-manager.nix { inherit pkgs lib; self = final; }; } // lib.optionalAttrs (options?sops) { - sops-nix = import ../../../lib/sops.nix { inherit pkgs lib; self = final; }; + sops-nix = import ../../../lib/env-specific/sops.nix { inherit pkgs lib; self = final; }; }); } diff --git a/modules/nixos/_private/extra-arguments.nix b/modules/nixos/_private/extra-arguments.nix index 41ed0ebe..da8cb8bb 100644 --- a/modules/nixos/_private/extra-arguments.nix +++ b/modules/nixos/_private/extra-arguments.nix @@ -8,8 +8,8 @@ in { _module.args.foodogsquaredLib = foodogsquaredLib.extend (final: prev: { - nixos = import ../../../lib/nixos.nix { inherit pkgs lib; self = final; }; + nixos = import ../../../lib/env-specific/nixos.nix { inherit pkgs lib; self = final; }; } // lib.optionalAttrs (options?sops) { - sops-nix = import ../../../lib/sops.nix { inherit pkgs lib; self = final; }; + sops-nix = import ../../../lib/env-specific/sops.nix { inherit pkgs lib; self = final; }; }); } diff --git a/modules/nixvim/_private/extra-arguments.nix b/modules/nixvim/_private/extra-arguments.nix index bfc64aa3..cb0908ab 100644 --- a/modules/nixvim/_private/extra-arguments.nix +++ b/modules/nixvim/_private/extra-arguments.nix @@ -7,6 +7,6 @@ in { _module.args.foodogsquaredLib = foodogsquaredLib.extend (final: prev: { - nixvim = import ../../../lib/nixvim.nix { inherit pkgs lib; self = final; }; + nixvim = import ../../../lib/env-specific/nixvim.nix { inherit pkgs lib; self = final; }; }); }