From 3fe53e70150d37a0548db455efbbce447eda8797 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 6 Nov 2024 11:58:09 +0700 Subject: [PATCH] chore(nix): Move stuff around --- nix/flake.nix | 6 +++--- nix/systems/darwin/default.nix | 2 +- nix/systems/nix/default.nix | 2 +- nix/users/default.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/flake.nix b/nix/flake.nix index 1f54a2e..2146b17 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -17,21 +17,21 @@ darwinConfigurations = ( import ./systems/darwin { inherit (nixpkgs-unstable) lib; - inherit inputs nixpkgs-stable nixpkgs-unstable nix-darwin brew-api home-manager nur vars; + inherit inputs nixpkgs-stable nixpkgs-unstable nur nix-darwin brew-api home-manager vars; } ); systemConfigs = ( # sudo is required, sadly import ./systems/nix { inherit (nixpkgs-unstable) lib; - inherit inputs nixpkgs-stable nixpkgs-unstable system-manager home-manager nur vars; + inherit inputs nixpkgs-stable nixpkgs-unstable nur system-manager home-manager vars; } ); homeConfigurations = ( import ./users { inherit (nixpkgs-unstable) lib; - inherit inputs nixpkgs-stable nixpkgs-unstable home-manager nur vars; + inherit inputs nixpkgs-stable nixpkgs-unstable nur home-manager vars; } ); }; diff --git a/nix/systems/darwin/default.nix b/nix/systems/darwin/default.nix index 4e04fd1..5a35717 100644 --- a/nix/systems/darwin/default.nix +++ b/nix/systems/darwin/default.nix @@ -1,4 +1,4 @@ -{ inputs, nixpkgs-stable, nixpkgs-unstable, nix-darwin, brew-api, nur, vars, ... }: +{ inputs, nixpkgs-stable, nixpkgs-unstable, nur, nix-darwin, brew-api, vars, ... }: let mkCommon = import ../../lib/mkCommon.nix; diff --git a/nix/systems/nix/default.nix b/nix/systems/nix/default.nix index c4bfb4f..068eaed 100644 --- a/nix/systems/nix/default.nix +++ b/nix/systems/nix/default.nix @@ -1,4 +1,4 @@ -{ inputs, nixpkgs-stable, nixpkgs-unstable, system-manager, nur, vars, ... }: +{ inputs, nixpkgs-stable, nixpkgs-unstable, nur, system-manager, vars, ... }: let mkCommon = import ../../lib/mkCommon.nix; diff --git a/nix/users/default.nix b/nix/users/default.nix index 1c17a27..606a9e1 100644 --- a/nix/users/default.nix +++ b/nix/users/default.nix @@ -1,4 +1,4 @@ -{ inputs, nixpkgs-stable, nixpkgs-unstable, home-manager, nur, vars, ... }: +{ inputs, nixpkgs-stable, nixpkgs-unstable, nur, home-manager, vars, ... }: let mkSystem = import ../lib/mkSystem.nix;