diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | justfile | 1 | ||||
| -rw-r--r-- | profiles/defaults.nix | 5 |
3 files changed, 4 insertions, 4 deletions
@@ -155,7 +155,7 @@ }; modules = [ { - system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + system.configurationRevision = self.rev or self.dirtyRev or null; system.nixos.versionSuffix = nixpkgs.lib.mkForce "git.${builtins.substring 0 11 nixpkgs.rev}"; nixpkgs.pkgs = pkgs; environment.systemPackages = [ pkgs.git ]; @@ -42,6 +42,7 @@ rbuild hostname: [group('linux')] rswitch hostname: @echo "switching {{hostname}} to new config..." + nixos-rebuild switch --keep-going --flake ".#{{hostname}}" --target-host {{hostname}} --fast --use-remote-sudo --use-substitutes # sync agenix key from 1password [group('secrets')] diff --git a/profiles/defaults.nix b/profiles/defaults.nix index d98daa0..6ada4c7 100644 --- a/profiles/defaults.nix +++ b/profiles/defaults.nix @@ -1,5 +1,4 @@ { - self, config, pkgs, lib, @@ -100,8 +99,8 @@ environment.etc.motd.text = '' Machine ${config.networking.hostName} - NixOS ${config.system.nixos.release} - @ ${self.shortRev or self.dirtyShortRev} + NixOS ${config.system.nixos.versionSuffix} + @ ${config.system.configurationRevision} ''; ## disable that slow "building man-cache" step |