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

fix: various left-overs

Browse source
This commit is contained in:
David Arnold 2021-04-18 23:48:19 -05:00
parent 8134350545
commit a714cf466d
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
9 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extern/default.nix vendored
View file

@ -7,10 +7,6 @@
overlays = [ overlays = [
nur.overlay nur.overlay
devshell.overlay
(final: prev: {
deploy-rs = deploy.packages.${prev.system}.deploy-rs;
})
pkgs.overlay pkgs.overlay
]; ];

2
flake.lock
View file

@ -81,7 +81,7 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"narHash": "sha256-/SJJ8u/qBnCtMbMxBmDNBDnLWnmro2ioi35gL45hP9w=", "narHash": "sha256-Mf67M0twCyNmRQxnhH51f6VroHaCwJKvFDMc1Wc7pt8=",
"path": "./lib", "path": "./lib",
"type": "path" "type": "path"
}, },

2
flake.nix
View file

@ -35,7 +35,7 @@
outputs = inputs@{ self, devos, nixos, nur, ... }: outputs = inputs@{ self, devos, nixos, nur, ... }:
devos.lib.mkFlake { devos.lib.mkFlake {
inherit self; inherit self inputs nixos;
hosts = ./hosts; hosts = ./hosts;
packages = import ./pkgs; packages = import ./pkgs;
suites = import ./suites; suites = import ./suites;

4
lib/devos/devosSystem.nix
View file

@ -1,6 +1,6 @@
{ lib }: { lib }:
{ userFlakeNixos, userFlakeSelf, userFlakeInputs }: { userFlakeNixOS, userFlakeSelf, userFlakeInputs }:
{ modules, ... } @ args: { modules, ... } @ args:
lib.nixosSystem (args // { lib.nixosSystem (args // {
@ -15,7 +15,7 @@ lib.nixosSystem (args // {
(args // { (args // {
modules = moduleList ++ [ modules = moduleList ++ [
"${userFlakeNixos}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix" "${userFlakeNixOS}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
({ config, suites, ... }: { ({ config, suites, ... }: {

8
lib/devos/mkHosts.nix
View file

@ -65,7 +65,7 @@ let
# Everything in `./modules/list.nix`. # Everything in `./modules/list.nix`.
flakeModules = { imports = builtins.attrValues userFlakeSelf.nixosModules ++ extern.modules; }; flakeModules = { imports = builtins.attrValues userFlakeSelf.nixosModules ++ extern.modules; };
cachix = ../../cachix.nix; cachix = "${userFlakeSelf}/cachix.nix";
}; };
specialArgs = extern.specialArgs // { suites = suites.system; }; specialArgs = extern.specialArgs // { suites = suites.system; };
@ -84,12 +84,12 @@ let
hosts = builtins.mapAttrs (_: host: host.config) hosts = builtins.mapAttrs (_: host: host.config)
(removeAttrs hosts [ hostName ]); (removeAttrs hosts [ hostName ]);
}; };
};
lib = {
lib = { inherit specialArgs; }; lib = { inherit specialArgs; };
lib.testModule = { lib.testModule = {
imports = builtins.attrValues modules; imports = builtins.attrValues modules;
}; };
}; };
in in
lib.os.devosSystem { lib.os.devosSystem {
@ -97,7 +97,7 @@ let
} { } {
inherit specialArgs; inherit specialArgs;
system = defaultSystem; system = defaultSystem;
modules = modules // { inherit local lib; }; modules = modules // { inherit local; };
}; };
hosts = lib.os.recImport hosts = lib.os.recImport

8
lib/mkFlake/evalOldArgs.nix
View file

@ -22,6 +22,14 @@ let
type = addCheck attrs lib.isStorePath; type = addCheck attrs lib.isStorePath;
description = "The flake to create the devos outputs for"; description = "The flake to create the devos outputs for";
}; };
nixos = mkOption {
type = addCheck attrs lib.isStorePath;
description = "The default nixpkgs channel of the devos";
};
inputs = mkOption {
type = addCheck attrs lib.isStorePath;
description = "All inptus of the devos";
};
hosts = mkOption { hosts = mkOption {
type = path; type = path;
default = "${userFlakeSelf}/hosts"; default = "${userFlakeSelf}/hosts";

2
lib/pkgs-lib/default.nix
View file

@ -3,7 +3,7 @@
lib.genAttrs lib.genAttrs
lib.defaultSystems (system: lib.defaultSystems (system:
{ {
tests = import ./tests { inherit lib deploy nixpkgs pkgs system; }; tests = import ./tests { inherit lib deploy nixpkgs system; };
shell = import ./shell { inherit lib devshell deploy nixpkgs system; }; shell = import ./shell { inherit lib devshell deploy nixpkgs system; };
} }
) )

2
lib/pkgs-lib/shell/default.nix
View file

@ -11,7 +11,7 @@ let
]; ];
pkgs = import nixpkgs { inherit system overlays;; config = {}; }; pkgs = import nixpkgs { inherit system overlays; config = {}; };
flk = pkgs.callPackage ./flk.nix { }; flk = pkgs.callPackage ./flk.nix { };

1
profiles/core/default.nix
View file

@ -11,7 +11,6 @@ in
binutils binutils
coreutils coreutils
curl curl
deploy-rs
direnv direnv
dnsutils dnsutils
dosfstools dosfstools