Multi system and pkgs cleanup

This commit is contained in:
soraefir
2026-06-20 12:50:42 +02:00
parent 8e21f3dae8
commit e5a75cb3b7
7 changed files with 131 additions and 98 deletions
+1 -5
View File
@@ -3,12 +3,8 @@
permittedInsecurePackages = [ ];
allowUnfree = true;
android_sdk.accept_license = true;
packageOverrides = pkgs: rec {
custom = import ../../../../packages { inherit pkgs; };
};
};
nixpkgs.overlays = import ../../../../overlays { inherit inputs pkgs; };
nixpkgs.overlays = import ../../../../overlays { inherit inputs; };
nix = {
package = pkgs.nixVersions.stable;
extraOptions = ''
+15 -6
View File
@@ -1,11 +1,15 @@
{ inputs, lib, ... }:
{ lib, ... }:
let
systemsDir = ../../../systems;
systemNames = lib.attrNames (lib.filterAttrs
(name: type: type == "directory" && builtins.pathExists (systemsDir + "/${name}/cfg.nix"))
(builtins.readDir systemsDir));
isIgnoredSystemDir = name: lib.hasPrefix "_" name || lib.hasPrefix "." name;
systemNames = lib.attrNames (
lib.filterAttrs
(name: type:
type == "directory"
&& !isIgnoredSystemDir name
&& builtins.pathExists (systemsDir + "/${name}/cfg.nix"))
(builtins.readDir systemsDir)
);
in with lib; {
options.usercfg = import ./user.nix {inherit lib;};
options.syscfg = {
@@ -14,6 +18,11 @@ in with lib; {
type = types.enum [ "nixos" "macos" "home" ];
default = "nixos";
};
system = mkOption {
type = types.enum [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
default = "x86_64-linux";
description = "Nix platform used to evaluate this host.";
};
defaultUser = mkOption { type = types.str; };
make = import ./make.nix {inherit lib;};
net = import ./net.nix {inherit lib;};