From d6f2b35cd5795b4bbbb69f37ea1a63761b36aa37 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Mon, 6 Feb 2023 14:30:35 -0800 Subject: [PATCH] flake: Renamed systems --- flake.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index b2a6523..8594e23 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,8 @@ outputs = inputs@{ self, nixpkgs, nixos-unstable, home-manager }: let - x64System = "x86_64-linux"; - darwinSystem = "aarch64-darwin"; + sysLinuxX86 = "x86_64-linux"; + sysDarwinAarch = "aarch64-darwin"; wrapPkgsSystem = { system }: import nixpkgs rec { @@ -30,22 +30,22 @@ config.allowUnfree = true; }; - pkgsX64 = wrapPkgsSystem { system = x64System; }; - unstableX64 = wrapUnstablePkgsSystem { system = x64System; }; + pkgsX64 = wrapPkgsSystem { system = sysLinuxX86; }; + unstableX64 = wrapUnstablePkgsSystem { system = sysLinuxX86; }; utilsX64 = import ./lib { inherit nixpkgs nixos-unstable home-manager; pkgs = pkgsX64; unstable = unstableX64; - system = x64System; + system = sysLinuxX86; }; - pkgsDarwin = wrapPkgsSystem { system = darwinSystem; }; - unstableDarwin = wrapUnstablePkgsSystem { system = darwinSystem; }; + pkgsDarwin = wrapPkgsSystem { system = sysDarwinAarch; }; + unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwinAarch; }; utilsDarwin = import ./lib { inherit nixpkgs nixos-unstable home-manager; pkgs = pkgsDarwin; unstable = unstableDarwin; - system = darwinSystem; + system = sysDarwinAarch; }; in { @@ -66,9 +66,11 @@ roles = [ "gnome" ]; }; }; - homeConfigurations.giulioMac = utilsDarwin.user.mkHMUser { - name = "giulio"; - roles = [ "ssh" ]; + homeConfigurations = { + giulioMac = utilsDarwin.user.mkHMUser { + name = "giulio"; + roles = [ "ssh" ]; + }; }; }; }