Commit dfd7e5bc authored by fpletz's avatar fpletz 🚧
Browse files

set correct deployment config revision

parent ff85dd13
{ name, pkgs, lib, flakes, ... }: { name, config, pkgs, lib, flakes, ... }:
{ {
deployment.targetHost = lib.mkDefault "${name}.muc.ccc.de"; deployment.targetHost = lib.mkDefault "${name}.muc.ccc.de";
networking.hostName = lib.mkDefault name; networking.hostName = lib.mkDefault name;
time.timeZone = "UTC"; time.timeZone = "UTC";
services.getty.helpLine = lib.mkForce "";
# between mkOptionDefault and mkDefault (on in rpi flake) # between mkOptionDefault and mkDefault (on in rpi flake)
boot.kernelPackages = lib.mkOverride 1001 pkgs.linuxPackages_latest; boot.kernelPackages = lib.mkOverride 1001 pkgs.linuxPackages_latest;
...@@ -53,9 +54,9 @@ ...@@ -53,9 +54,9 @@
]; ];
# include git rev of this repo/flake into the nixos-version # include git rev of this repo/flake into the nixos-version
system.configurationRevision = flakes.nixpkgs.lib.mkIf (flakes.self ? rev) flakes.self.rev; system.configurationRevision = if flakes.self ? rev then flakes.self.rev else "dirty";
system.nixos.revision = flakes.nixpkgs.rev; system.nixos.revision = flakes.nixpkgs.rev;
system.nixos.versionSuffix = "-${lib.substring 0 8 flakes.nixpkgs.rev}"; system.nixos.versionSuffix = ".${flakes.nixpkgs.shortRev}-${lib.substring 0 8 config.system.configurationRevision}";
# set nixpkgs on the target to the nixpkgs version of the deployment # set nixpkgs on the target to the nixpkgs version of the deployment
nix.registry.nixpkgs.flake = flakes.nixpkgs; nix.registry.nixpkgs.flake = flakes.nixpkgs;
nix.nixPath = lib.mkForce [ "nixpkgs=${flakes.nixpkgs}" "nixos-config=/dontuse" ]; nix.nixPath = lib.mkForce [ "nixpkgs=${flakes.nixpkgs}" "nixos-config=/dontuse" ];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment