From d23ae4bdcf6f1ca9d103803889ecfee397b9b550 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 1 Nov 2025 16:07:13 +0000 Subject: [PATCH] Fix evaluation warnings Signed-off-by: Oliver Davies --- flake.lock | 26 ++++++++++---------- modules/git-repo-updater.nix | 4 +-- modules/scripts/clone.nix | 2 +- modules/scripts/datepath.nix | 2 +- modules/scripts/onchange.nix | 2 +- modules/scripts/open-repo-url.nix | 2 +- modules/scripts/ppp.nix | 2 +- modules/scripts/ptest.nix | 2 +- modules/scripts/skills.nix | 2 +- modules/scripts/start-tmux.nix | 4 +-- modules/scripts/tmux-default-startup.nix | 2 +- modules/scripts/tmux-sessionizer/package.nix | 2 +- modules/scripts/today.nix | 2 +- modules/scripts/today2.nix | 4 +-- modules/z.nix | 4 +-- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 2de6ab92..953011ea 100644 --- a/flake.lock +++ b/flake.lock @@ -327,11 +327,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -400,11 +400,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1761829429, - "narHash": "sha256-VuFa5OzKyYl4XvQwaWS9ZfhVrtpCYPE3Dgy83kDPf30=", + "lastModified": 1761947009, + "narHash": "sha256-yutWdFO7EkJGdQOquwHvyWZ+3KpPowzy+v1xb8IA/K4=", "owner": "nix-community", "repo": "nixvim", - "rev": "0420aa712f01b08b4d9f36b1a46b2f26c720aa80", + "rev": "fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1761945266, - "narHash": "sha256-AufTZYAaJ1JFWfzNq/BIt5EnKuPSF/JUd5SsdE8Qujk=", + "lastModified": 1762009359, + "narHash": "sha256-d6nVA9FRfgvLubgkRSut2OZHMC1dj+2oZPkEF65cPd8=", "owner": "nix-community", "repo": "NUR", - "rev": "8e76d48dc70fdfe15518f0ce2f7c4a5fa07e4369", + "rev": "024437792c0750dfab885880a193e81b44997034", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1761850181, - "narHash": "sha256-xV1ratks4zEJpveojsN72iIFEcvPCQ0cOZr8tRk9WXM=", + "lastModified": 1762010154, + "narHash": "sha256-kGXtP2pRDAJcSc8N1yqXyvfggu9Ad/I2+5eAUAOYyRs=", "ref": "refs/heads/main", - "rev": "5cffffcf7c2c44a9d7c3ef1c7117cc70fe3d063c", - "revCount": 128, + "rev": "e3a615a6109bfc5a4c90530ba0a9b46b287a6a83", + "revCount": 132, "type": "git", "url": "https://code.oliverdavies.uk/opdavies/z" }, diff --git a/modules/git-repo-updater.nix b/modules/git-repo-updater.nix index 25fb059f..1b78a042 100644 --- a/modules/git-repo-updater.nix +++ b/modules/git-repo-updater.nix @@ -2,10 +2,10 @@ { flake.modules.nixos.base = - { system, ... }: + { pkgs, ... }: { environment.systemPackages = [ - inputs.git-repo-updater.packages.${system}.default + inputs.git-repo-updater.packages.${pkgs.stdenv.hostPlatform.system}.default ]; }; } diff --git a/modules/scripts/clone.nix b/modules/scripts/clone.nix index bcfefeba..814c93cc 100644 --- a/modules/scripts/clone.nix +++ b/modules/scripts/clone.nix @@ -47,7 +47,7 @@ { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.clone)) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.clone)) ]; }; } diff --git a/modules/scripts/datepath.nix b/modules/scripts/datepath.nix index fa2b4e4d..44101018 100644 --- a/modules/scripts/datepath.nix +++ b/modules/scripts/datepath.nix @@ -20,7 +20,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/onchange.nix b/modules/scripts/onchange.nix index 78e36bf4..6ce168dc 100644 --- a/modules/scripts/onchange.nix +++ b/modules/scripts/onchange.nix @@ -29,7 +29,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/open-repo-url.nix b/modules/scripts/open-repo-url.nix index 35e5b5f0..85348f2e 100644 --- a/modules/scripts/open-repo-url.nix +++ b/modules/scripts/open-repo-url.nix @@ -26,7 +26,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/ppp.nix b/modules/scripts/ppp.nix index 17cba13a..90c96ae4 100644 --- a/modules/scripts/ppp.nix +++ b/modules/scripts/ppp.nix @@ -20,7 +20,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/ptest.nix b/modules/scripts/ptest.nix index a0cfa6eb..487da87c 100644 --- a/modules/scripts/ptest.nix +++ b/modules/scripts/ptest.nix @@ -36,7 +36,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/skills.nix b/modules/scripts/skills.nix index b1af10a0..e6a46f00 100644 --- a/modules/scripts/skills.nix +++ b/modules/scripts/skills.nix @@ -20,7 +20,7 @@ in { config, pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; home.sessionVariables.SKILLS_FILE = "${config.home.sessionVariables.NOTES_DIRECTORY}/2-areas/skills.csv"; diff --git a/modules/scripts/start-tmux.nix b/modules/scripts/start-tmux.nix index e3180401..3fb6ee8e 100644 --- a/modules/scripts/start-tmux.nix +++ b/modules/scripts/start-tmux.nix @@ -12,7 +12,7 @@ in runtimeInputs = with pkgs; [ fzf - inputs.z.packages.${pkgs.system}.default + inputs.z.packages.${pkgs.stdenv.hostPlatform.system}.default ]; text = '' @@ -27,7 +27,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/tmux-default-startup.nix b/modules/scripts/tmux-default-startup.nix index 0264a8ea..c9de163d 100644 --- a/modules/scripts/tmux-default-startup.nix +++ b/modules/scripts/tmux-default-startup.nix @@ -30,7 +30,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/tmux-sessionizer/package.nix b/modules/scripts/tmux-sessionizer/package.nix index e33b99a6..90e66dfb 100644 --- a/modules/scripts/tmux-sessionizer/package.nix +++ b/modules/scripts/tmux-sessionizer/package.nix @@ -83,7 +83,7 @@ { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.tmux-sessionizer)) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.tmux-sessionizer)) ]; }; } diff --git a/modules/scripts/today.nix b/modules/scripts/today.nix index 1abbee1f..57ff2b61 100644 --- a/modules/scripts/today.nix +++ b/modules/scripts/today.nix @@ -20,7 +20,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/scripts/today2.nix b/modules/scripts/today2.nix index 90a76c59..15cdddf4 100644 --- a/modules/scripts/today2.nix +++ b/modules/scripts/today2.nix @@ -1,4 +1,4 @@ -{ withSystem, ... }: +{ withSystem, ... }: let name = "today2"; @@ -20,7 +20,7 @@ in { pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; }; } diff --git a/modules/z.nix b/modules/z.nix index c085e0b9..010bb4dc 100644 --- a/modules/z.nix +++ b/modules/z.nix @@ -7,14 +7,14 @@ in perSystem = { pkgs, ... }: { - packages.${name} = inputs.${name}.packages.${pkgs.system}.default; + packages.${name} = inputs.${name}.packages.${pkgs.stdenv.hostPlatform.system}.default; }; flake.modules.homeManager.base = { config, pkgs, ... }: { home.packages = [ - (withSystem pkgs.system (psArgs: psArgs.config.packages.${name})) + (withSystem pkgs.stdenv.hostPlatform.system (psArgs: psArgs.config.packages.${name})) ]; home.sessionVariables = {