Compare commits

..

No commits in common. "11074a5b0683fec3a3dfd5d629341b9cdcc061c9" and "51b714c1596731149f117eac07571be828cac2eb" have entirely different histories.

View File

@ -11,9 +11,8 @@
outputs =
inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
let
sysLinuxX86 = "x86_64-linux";
sysDarwinAarch = "aarch64-darwin";
sysLinuxAarch = "aarch-linux";
x64System = "x86_64-linux";
darwinSystem = "aarch64-darwin";
wrapPkgsSystem = { system }:
import nixpkgs rec {
@ -31,43 +30,34 @@
config.allowUnfree = true;
};
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX86; };
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX86; };
utilsLinuxX64 = import ./lib {
pkgsX64 = wrapPkgsSystem { system = x64System; };
unstableX64 = wrapUnstablePkgsSystem { system = x64System; };
utilsX64 = import ./lib {
inherit nixpkgs nixos-unstable home-manager;
pkgs = pkgsLinuxX64;
unstable = unstableLinuxX64;
system = sysLinuxX86;
pkgs = pkgsX64;
unstable = unstableX64;
system = x64System;
};
pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
utilsLinuxAarch = import ./lib {
inherit nixpkgs nixos-unstable home-manager;
pkgs = pkgsLinuxAarch;
unstable = unstableLinuxAarch;
system = sysLinuxAarch;
};
pkgsDarwin = wrapPkgsSystem { system = sysDarwinAarch; };
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwinAarch; };
pkgsDarwin = wrapPkgsSystem { system = darwinSystem; };
unstableDarwin = wrapUnstablePkgsSystem { system = darwinSystem; };
utilsDarwin = import ./lib {
inherit nixpkgs nixos-unstable home-manager;
pkgs = pkgsDarwin;
unstable = unstableDarwin;
system = sysDarwinAarch;
system = darwinSystem;
};
in
{
nixosConfigurations = {
architect = utilsLinuxX64.host.mkHost {
architect = utilsX64.host.mkHost {
name = "architect";
users = [{
user = "giulio";
roles = [ ];
}];
};
gAluminum = utilsLinuxX64.host.mkHost {
gAluminum = utilsX64.host.mkHost {
name = "gAluminum";
users = [{
user = "giulio";
@ -76,15 +66,9 @@
roles = [ "gnome" ];
};
};
homeConfigurations = {
giulioMac = utilsDarwin.user.mkHMUser {
homeConfigurations.giulioMac = utilsDarwin.user.mkHMUser {
name = "giulio";
roles = [ "ssh" ];
};
giulioAarch = utilsAarch.user.mkHMUser {
name = "giulio";
roles = [ "ssh" ];
};
};
};
}