From be0b31c429beedf11a2851f83dc9aad386e76e47 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 13 Jul 2024 10:04:02 -0400 Subject: [PATCH] nixosConfig: specialArgs = "inputs" -> "{inherit inputs;}" --- flake.nix | 8 +++----- machines/universedesktop/configuration.nix | 4 ++-- machines/universedesktop/programs/desktop.nix | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index ac74070..e7e372e 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ nixosConfigurations = { nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = { inherit inputs; }; modules = [ ({ config, pkgs, ... }: { @@ -39,7 +39,7 @@ }; universedesktop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = { inherit inputs; }; modules = [ ({ config, pkgs, ... }: { @@ -52,9 +52,7 @@ }; darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; - specialArgs = { - inputs = inputs; - }; + specialArgs = { inherit inputs; }; modules = [ ./machines/universeair/configuration.nix ({ config, pkgs, ... }: { diff --git a/machines/universedesktop/configuration.nix b/machines/universedesktop/configuration.nix index c5e41cd..911fd34 100644 --- a/machines/universedesktop/configuration.nix +++ b/machines/universedesktop/configuration.nix @@ -2,9 +2,9 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ lib, config, pkgs, nixpkgs, ... }: { +{ lib, config, pkgs, inputs, ... }: { nix.settings.auto-optimise-store = true; - nix.registry.nixpkgs.flake = nixpkgs; + nix.registry.nixpkgs.flake = inputs.nixpkgs; # Allow user-mode qemu for running riscv64 binaries # boot.binfmt.emulatedSystems = [ "riscv64-linux" ]; diff --git a/machines/universedesktop/programs/desktop.nix b/machines/universedesktop/programs/desktop.nix index 6a23b5a..e9081a3 100644 --- a/machines/universedesktop/programs/desktop.nix +++ b/machines/universedesktop/programs/desktop.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, nixpkgs, ... }: { +{ lib, config, pkgs, ... }: { nixpkgs.overlays = [(self: super: rec { # Discord fix discord = super.discord.override {