From 4800a19e878b9e37121bcf6ffd902a04ff0b6050 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Sat, 20 Jun 2026 13:57:34 +0200 Subject: [PATCH] Remove inputs.version option --- flake.nix | 17 ++--------------- systems.nix | 4 +--- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 2d67007..f250030 100644 --- a/flake.nix +++ b/flake.nix @@ -110,21 +110,8 @@ }@systemConfig: let - inherit (systemConfig.inputs) version; - pkgs = - if version == "26.05" then - inputs.nixpkgs - else if version == "25.11" then - inputs.nixpkgs-25-11 - else - inputs.nixpkgs-unstable; - hm = - if version == "26.05" then - inputs.home-manager - else if version == "25.11" then - inputs.home-manager-25-11 - else - inputs.home-manager-unstable; + pkgs = inputs.nixpkgs; + hm = inputs.home-manager; # ========== Extend lib with lib.my ========== # NOTE: This approach allows lib.my to propagate into hm # see: https://github.com/nix-community/home-manager/pull/3454 diff --git a/systems.nix b/systems.nix index c4be7c1..3ef053b 100644 --- a/systems.nix +++ b/systems.nix @@ -14,7 +14,6 @@ let nvidia.enable = false; address.tailnet = common.tailnetAddr hostName; nixos.dir = "/etc/nixos"; - inputs.version = "25.11"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It's perfectly fine and recommended to leave @@ -35,7 +34,7 @@ builtins.mapAttrs (hostName: lib.recursiveUpdate (defaultConfig hostName)) { ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNlHKE/BD8kKfhJD7GBk1A3whZf3gTjk9VEgGAj3qsH"; git.signing.key = "848D71DE0590C199"; kind = "workstation"; - inputs.version = "26.05"; + version = "26.05"; }; pi4 = { system = "aarch64-linux"; @@ -52,7 +51,6 @@ builtins.mapAttrs (hostName: lib.recursiveUpdate (defaultConfig hostName)) { git.signing.key = "4E323F914029E976"; prometheus.port = 9090; kind = "server"; - inputs.version = "26.05"; version = "26.05"; }; # Samsung S23 FE -- 2.51.2