Compare commits

..

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

View File

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