diff --git a/default.nix b/default.nix index b348226..e3c4ca1 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,7 @@ let inherit (default.inputs.nixos) lib; - default = (import ./compat).defaultNix; + default = (import ./lib/compat).defaultNix; in builtins.mapAttrs (_: v: lib.recurseIntoAttrs v) default.packages // { shell = import ./shell.nix; diff --git a/compat/default.nix b/lib/compat/default.nix similarity index 74% rename from compat/default.nix rename to lib/compat/default.nix index 2ee185c..9ed54a7 100644 --- a/compat/default.nix +++ b/lib/compat/default.nix @@ -1,7 +1,7 @@ let inherit (lock.nodes.flake-compat.locked) rev narHash; - lock = builtins.fromJSON (builtins.readFile ../flake.lock); + lock = builtins.fromJSON (builtins.readFile ../../flake.lock); flake = (import ( fetchTarball { @@ -10,7 +10,7 @@ let } ) { - src = ../.; + src = ../../.; }); in flake diff --git a/compat/nixos/default.nix b/lib/compat/nixos/default.nix similarity index 100% rename from compat/nixos/default.nix rename to lib/compat/nixos/default.nix diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix index b48b440..abb7c4e 100644 --- a/lib/devos/mkHosts.nix +++ b/lib/devos/mkHosts.nix @@ -37,7 +37,7 @@ let nix.nixPath = [ "nixpkgs=${nixos}" - "nixos-config=${self}/compat/nixos" + "nixos-config=${self}/lib/compat/nixos" "home-manager=${inputs.home}" ]; diff --git a/nix/ci.nix b/nix/ci.nix index 5152cd2..f36d2b2 100644 --- a/nix/ci.nix +++ b/nix/ci.nix @@ -1,7 +1,7 @@ let inherit (default.inputs.nixos) lib; - default = (import "${../.}/compat").defaultNix; + default = (import "${../lib}/compat").defaultNix; ciSystems = [ "aarch64-linux" diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 1bca2b9..15824b0 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -77,7 +77,7 @@ in ''; # fix nixos-option - nixos-option = "nixos-option -I nixpkgs=${toString ../../compat}"; + nixos-option = "nixos-option -I nixpkgs=${toString ../../lib/compat}"; # sudo s = ifSudo "sudo -E "; diff --git a/shell.nix b/shell.nix index c05730d..575a5d8 100644 --- a/shell.nix +++ b/shell.nix @@ -1 +1 @@ -(import ./compat).shellNix +(import ./lib/compat).shellNix