mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 01:50:44 -06:00
more pipes
This commit is contained in:
parent
56eafc5350
commit
e0a862ce4d
4 changed files with 22 additions and 21 deletions
|
@ -1,6 +1,6 @@
|
||||||
inputs: final: prev:
|
inputs: final: prev:
|
||||||
let
|
let
|
||||||
inherit (builtins) listToAttrs substring filter;
|
inherit (builtins) listToAttrs substring;
|
||||||
inherit (final)
|
inherit (final)
|
||||||
concatStringsSep
|
concatStringsSep
|
||||||
hasSuffix
|
hasSuffix
|
||||||
|
@ -12,6 +12,7 @@ let
|
||||||
inherit (final.filesystem) listFilesRecursive;
|
inherit (final.filesystem) listFilesRecursive;
|
||||||
in
|
in
|
||||||
let
|
let
|
||||||
|
|
||||||
enabled = {
|
enabled = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
@ -68,7 +69,7 @@ let
|
||||||
|
|
||||||
isNixFile = p: hasSuffix ".nix" p;
|
isNixFile = p: hasSuffix ".nix" p;
|
||||||
isDefaultNixFile = p: hasSuffix "default.nix" p;
|
isDefaultNixFile = p: hasSuffix "default.nix" p;
|
||||||
filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
|
filterNotDefaultNixFile = paths: builtins.filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
|
||||||
listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
|
listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
|
||||||
|
|
||||||
# defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
|
# defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
|
||||||
|
@ -81,6 +82,10 @@ let
|
||||||
pkgs = pkgsFromSystem system;
|
pkgs = pkgsFromSystem system;
|
||||||
pkg = pkgFromSystem system;
|
pkg = pkgFromSystem system;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
functional = {
|
||||||
|
filterF = list: f: builtins.filter f list;
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit
|
inherit
|
||||||
|
@ -99,5 +104,6 @@ in
|
||||||
pkgFromSystem
|
pkgFromSystem
|
||||||
overlayFrom
|
overlayFrom
|
||||||
flakeFromSystem
|
flakeFromSystem
|
||||||
|
functional
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,31 +20,17 @@ let
|
||||||
flake = flakeFromSystem "x86_64-linux";
|
flake = flakeFromSystem "x86_64-linux";
|
||||||
hostPath = host: ../. + "/hosts/${host}";
|
hostPath = host: ../. + "/hosts/${host}";
|
||||||
# all nix files not including pkgs.nix
|
# all nix files not including pkgs.nix
|
||||||
hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
|
# hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
|
||||||
|
|
||||||
|
hostFiles = host: host |> hostPath |> listFilesRecursive |> filter isNixFile;
|
||||||
|
|
||||||
# hostFiles =
|
|
||||||
# host:
|
|
||||||
# filter isNixFile (
|
|
||||||
# host
|
|
||||||
# |> hostPath
|
|
||||||
# |> listFilesRecursive
|
|
||||||
# )
|
|
||||||
|
|
||||||
mkIso = nixosSystem {
|
mkIso = nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
inputs.lix-module.nixosModules.default
|
inputs.lix-module.nixosModules.default
|
||||||
self.nixosModules.nix
|
self.nixosModules.nix
|
||||||
self.nixosModules.essentials
|
self.nixosModules.essentials
|
||||||
(
|
self.nixosModules.iso
|
||||||
{ pkgs, modulesPath, ... }:
|
|
||||||
{
|
|
||||||
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
|
|
||||||
environment.systemPackages = (with pkgs; [ neovim ]) ++ [
|
|
||||||
self.packages.${pkgs.system}.default
|
|
||||||
];
|
|
||||||
}
|
|
||||||
)
|
|
||||||
];
|
];
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit
|
inherit
|
||||||
|
|
5
modules/iso.nix
Normal file
5
modules/iso.nix
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{ pkgs, modulesPath, ... }:
|
||||||
|
{
|
||||||
|
imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
|
||||||
|
environment.systemPackages = (with pkgs; [ neovim ]);
|
||||||
|
}
|
|
@ -16,7 +16,11 @@ in
|
||||||
# nix.package = pkgs.nixVersions.latest;
|
# nix.package = pkgs.nixVersions.latest;
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
experimental-features = [ "nix-command" "flakes" "pipe-operator"];
|
experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
"pipe-operator"
|
||||||
|
];
|
||||||
use-xdg-base-directories = true;
|
use-xdg-base-directories = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue