teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

lib: move compat to lib

Browse source
This commit is contained in:
Timothy DeHerrera 2021-04-18 20:51:47 -06:00
parent fbce126f4d
commit 127cb25bd1
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
default.nix
View file

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

4
compat/default.nix → lib/compat/default.nix
View file

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

0
compat/nixos/default.nix → lib/compat/nixos/default.nix
View file

2
lib/devos/mkHosts.nix
View file

@ -37,7 +37,7 @@ let
nix.nixPath = [
"nixpkgs=${nixos}"
"nixos-config=${self}/compat/nixos"
"nixos-config=${self}/lib/compat/nixos"
"home-manager=${inputs.home}"
];

2
nix/ci.nix
View file

@ -1,7 +1,7 @@
let
inherit (default.inputs.nixos) lib;
default = (import "${../.}/compat").defaultNix;
default = (import "${../lib}/compat").defaultNix;
ciSystems = [
"aarch64-linux"

2
profiles/core/default.nix
View file

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

2
shell.nix
View file

@ -1 +1 @@
(import ./compat).shellNix
(import ./lib/compat).shellNix