flake: Renamed systems
This commit is contained in:
parent
51b714c159
commit
d6f2b35cd5
20
flake.nix
20
flake.nix
@ -11,8 +11,8 @@
|
|||||||
outputs =
|
outputs =
|
||||||
inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
|
inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
|
||||||
let
|
let
|
||||||
x64System = "x86_64-linux";
|
sysLinuxX86 = "x86_64-linux";
|
||||||
darwinSystem = "aarch64-darwin";
|
sysDarwinAarch = "aarch64-darwin";
|
||||||
|
|
||||||
wrapPkgsSystem = { system }:
|
wrapPkgsSystem = { system }:
|
||||||
import nixpkgs rec {
|
import nixpkgs rec {
|
||||||
@ -30,22 +30,22 @@
|
|||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgsX64 = wrapPkgsSystem { system = x64System; };
|
pkgsX64 = wrapPkgsSystem { system = sysLinuxX86; };
|
||||||
unstableX64 = wrapUnstablePkgsSystem { system = x64System; };
|
unstableX64 = wrapUnstablePkgsSystem { system = sysLinuxX86; };
|
||||||
utilsX64 = import ./lib {
|
utilsX64 = import ./lib {
|
||||||
inherit nixpkgs nixos-unstable home-manager;
|
inherit nixpkgs nixos-unstable home-manager;
|
||||||
pkgs = pkgsX64;
|
pkgs = pkgsX64;
|
||||||
unstable = unstableX64;
|
unstable = unstableX64;
|
||||||
system = x64System;
|
system = sysLinuxX86;
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgsDarwin = wrapPkgsSystem { system = darwinSystem; };
|
pkgsDarwin = wrapPkgsSystem { system = sysDarwinAarch; };
|
||||||
unstableDarwin = wrapUnstablePkgsSystem { system = darwinSystem; };
|
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 = darwinSystem;
|
system = sysDarwinAarch;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@ -66,9 +66,11 @@
|
|||||||
roles = [ "gnome" ];
|
roles = [ "gnome" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
homeConfigurations.giulioMac = utilsDarwin.user.mkHMUser {
|
homeConfigurations = {
|
||||||
|
giulioMac = utilsDarwin.user.mkHMUser {
|
||||||
name = "giulio";
|
name = "giulio";
|
||||||
roles = [ "ssh" ];
|
roles = [ "ssh" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user