From b0093ef58f73630e2e039557f303e1aa86eb27e2 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 29 Dec 2025 02:25:50 +0100 Subject: [PATCH] remove deprecated `system` passing fixes 'system' has been renamed to/replaced by 'stdenv.hostPlatform.system' Wherever possible, it's best to reference the hostPlatform of the nixpkgs instance directly via `config`. This is only possible in NixOS systems though, for standalon home-manager configs we need to get that value through `pkgs.stdenv`. --- common/guest.nix | 3 +-- flake.nix | 9 +++------ home/common.nix | 1 - home/desktop.nix | 1 - home/modules/captive-browser.nix | 1 - home/modules/fonts.nix | 3 +-- home/modules/latex.nix | 1 - home/modules/llm.nix | 1 - home/modules/packages.nix | 5 ++--- home/modules/vscodium.nix | 1 - home/workmac.nix | 3 +-- hosts/framenix/default.nix | 4 ++-- hosts/thinknix/hardware-configuration.nix | 2 ++ 13 files changed, 12 insertions(+), 23 deletions(-) diff --git a/common/guest.nix b/common/guest.nix index 2084b97..4ae7021 100644 --- a/common/guest.nix +++ b/common/guest.nix @@ -1,7 +1,6 @@ { config, lib, - system, ... }: let @@ -56,7 +55,7 @@ in # Optionally use extraSpecialArgs # to pass through arguments to home.nix extraSpecialArgs = { - inherit inputs system; + inherit inputs; }; }; diff --git a/flake.nix b/flake.nix index 0241e2d..7fd80f4 100644 --- a/flake.nix +++ b/flake.nix @@ -80,14 +80,11 @@ system: extraModules: nixpkgs.lib.nixosSystem rec { modules = (defaultModules system) ++ extraModules; - inherit system; - specialArgs = { - inherit system; - }; }; mkHomeManager = confName: user: system: # unfortunately, home-manager configs are still system-specific home-manager.lib.homeManagerConfiguration { + # XXX: when can we move to hostPlatform? pkgs = import (mkNixpkgs-patched system) { inherit system; }; modules = [ { @@ -102,7 +99,7 @@ # Optionally use extraSpecialArgs # to pass through arguments to home.nix extraSpecialArgs = { - inherit inputs system; + inherit inputs; }; }; treefmtConf = @@ -200,7 +197,7 @@ exit 0 fi ${ - inputs.home-manager.packages.${pkgs.system}.home-manager + inputs.home-manager.packages.${system}.home-manager }/bin/home-manager --flake "${self}#$profile" "$@" ''}/bin/hm"; }; diff --git a/home/common.nix b/home/common.nix index afeadbf..ed9157f 100644 --- a/home/common.nix +++ b/home/common.nix @@ -2,7 +2,6 @@ pkgs, inputs, config, - system, lib, ... }: diff --git a/home/desktop.nix b/home/desktop.nix index 6d45ec0..4dfea52 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -2,7 +2,6 @@ pkgs, inputs, config, - system, lib, ... }: diff --git a/home/modules/captive-browser.nix b/home/modules/captive-browser.nix index 501cdfb..b37f9f0 100644 --- a/home/modules/captive-browser.nix +++ b/home/modules/captive-browser.nix @@ -3,7 +3,6 @@ lib, inputs, config, - system, ... }: diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 5bcdf53..9bb264d 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -2,7 +2,6 @@ pkgs, inputs, config, - system, ... }: { @@ -15,7 +14,7 @@ twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) - inputs.nur.legacyPackages.${system}.repos.schmittlauch.vollkorn + inputs.nur.legacyPackages.${pkgs.stdenv.hostPlatform.system}.repos.schmittlauch.vollkorn # TODO: humor-sans # fcio corporate design, TODO module diff --git a/home/modules/latex.nix b/home/modules/latex.nix index a9b853c..d3469dc 100644 --- a/home/modules/latex.nix +++ b/home/modules/latex.nix @@ -2,7 +2,6 @@ pkgs, inputs, config, - system, lib, ... }: diff --git a/home/modules/llm.nix b/home/modules/llm.nix index 80466d4..9ea7a74 100644 --- a/home/modules/llm.nix +++ b/home/modules/llm.nix @@ -3,7 +3,6 @@ lib, inputs, config, - system, ... }: let diff --git a/home/modules/packages.nix b/home/modules/packages.nix index c267b3a..47e37ae 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -2,15 +2,14 @@ pkgs, inputs, config, - system, ... }: with pkgs; let cfg = config.schmittlauch.packages; - unstable = inputs.nixos-unstable.legacyPackages.${system}; - nur = inputs.nur.legacyPackages.${system}; + unstable = inputs.nixos-unstable.legacyPackages.${stdenv.hostPlatform.system}; + nur = inputs.nur.legacyPackages.${stdenv.hostPlatform.system}; graphicsApps = [ inkscape diff --git a/home/modules/vscodium.nix b/home/modules/vscodium.nix index 8926b3e..bf456b3 100644 --- a/home/modules/vscodium.nix +++ b/home/modules/vscodium.nix @@ -3,7 +3,6 @@ lib, inputs, config, - system, ... }: { diff --git a/home/workmac.nix b/home/workmac.nix index 93622e6..95e4aa3 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -2,14 +2,13 @@ pkgs, inputs, config, - system, lib, ... }: with pkgs; let - unstable = inputs.nixos-unstable.legacyPackages.${system}; + unstable = inputs.nixos-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { imports = [ ./modules/llm.nix ]; diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index d007dc6..2d443c4 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -2,11 +2,11 @@ config, lib, pkgs, - system, ... }: let - unstable = config.inputInjection.flake-inputs.nixos-unstable.legacyPackages.${system}; + unstable = + config.inputInjection.flake-inputs.nixos-unstable.legacyPackages.${config.nixpkgs.hostPlatform}; in { imports = [ diff --git a/hosts/thinknix/hardware-configuration.nix b/hosts/thinknix/hardware-configuration.nix index 5ad4ef8..34f717f 100644 --- a/hosts/thinknix/hardware-configuration.nix +++ b/hosts/thinknix/hardware-configuration.nix @@ -9,6 +9,8 @@ { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci"