From d65a9d81dc356ffad7541f966bc13ba7bcca136d Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Mon, 23 Oct 2023 21:43:46 +0200 Subject: [PATCH] pinwheel: Set `configuration-manager.system` from `pkgs.system` --- flake.nix | 5 ++--- hosts/pinwheel/configuration.nix | 4 ++-- hosts/pinwheel/modules/screenshot/default.nix | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index eea975d..068434d 100644 --- a/flake.nix +++ b/flake.nix @@ -34,10 +34,9 @@ outputs = { self, ... }@inputs: { nixosConfigurations = { - pinwheel = let + pinwheel = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - in inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs system; }; + specialArgs = { inherit inputs; }; modules = [ ./hosts/pinwheel/configuration.nix inputs.agenix.nixosModules.default diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix index dd91e41..a649b38 100644 --- a/hosts/pinwheel/configuration.nix +++ b/hosts/pinwheel/configuration.nix @@ -1,4 +1,4 @@ -{ system, pkgs, ... }: +{ pkgs, ... }: { imports = [ @@ -72,7 +72,7 @@ config-manager = { flakePath = "/home/alex/config"; - system=system; + system=pkgs.system; }; mod = { diff --git a/hosts/pinwheel/modules/screenshot/default.nix b/hosts/pinwheel/modules/screenshot/default.nix index 5198838..fa8dae1 100644 --- a/hosts/pinwheel/modules/screenshot/default.nix +++ b/hosts/pinwheel/modules/screenshot/default.nix @@ -1,5 +1,7 @@ -{ inputs, pkgs, lib, system, config, ...}: +{ inputs, pkgs, lib, config, ...}: let + system = config.config-manager.system; + hyprlandEnabled = config.mod.hyprland.enable; grimblast = inputs.hyprland-contrib.packages.${system}.grimblast;