chore(nix): Move stuff around
This commit is contained in:
parent
7f4d3a0260
commit
0f33f4e2de
2 changed files with 6 additions and 4 deletions
|
@ -1,6 +1,8 @@
|
||||||
{ inputs, nixpkgs, nix-darwin, home-manager, vars, ... }:
|
{ inputs, nixpkgs, nix-darwin, home-manager, vars, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
mkCommon = import ../mkCommon.nix;
|
||||||
|
|
||||||
disablePyChecks = pkg: pkg.overridePythonAttrs (old: {
|
disablePyChecks = pkg: pkg.overridePythonAttrs (old: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
doInstallCheck = false;
|
doInstallCheck = false;
|
||||||
|
@ -25,7 +27,6 @@ let
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
mkCommon = import ../mkCommon.nix;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# Host list
|
# Host list
|
||||||
|
@ -56,11 +57,11 @@ in
|
||||||
MacBookProM1 =
|
MacBookProM1 =
|
||||||
let
|
let
|
||||||
inherit (systemConfig "aarch64-darwin") system pkgs;
|
inherit (systemConfig "aarch64-darwin") system pkgs;
|
||||||
vars.common = (mkCommon pkgs);
|
common = (mkCommon pkgs);
|
||||||
in
|
in
|
||||||
nix-darwin.lib.darwinSystem {
|
nix-darwin.lib.darwinSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = { inherit inputs pkgs home-manager vars; };
|
specialArgs = { inherit inputs pkgs home-manager vars common; };
|
||||||
modules = [
|
modules = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
home-manager.darwinModules.home-manager
|
home-manager.darwinModules.home-manager
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
{ inputs, nixpkgs, system-manager, home-manager, vars, ... }:
|
{ inputs, nixpkgs, system-manager, home-manager, vars, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
mkCommon = import ../mkCommon.nix;
|
||||||
|
|
||||||
disablePyChecks = pkg: pkg.overridePythonAttrs (old: {
|
disablePyChecks = pkg: pkg.overridePythonAttrs (old: {
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
doInstallCheck = false;
|
doInstallCheck = false;
|
||||||
|
@ -25,7 +27,6 @@ let
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
mkCommon = import ../mkCommon.nix;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"potato" =
|
"potato" =
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue