dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-11-25 23:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix needsreboot activation script

Browse Source
This commit is contained in:
Dave Gallant
2025-11-06 09:14:41 -05:00
parent 3a92c8be54
commit e9f931bb7a
3 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
flake.lock generated
View File

@@ -102,12 +102,12 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1761251546,
"narHash": "sha256-I/TDYHCKui0K62f2cEk2UJf6N9rO/hdsa65kpEJMhSo=",
"rev": "70beec406153496943274f59cb2ded76be49fcd7",
"revCount": 306,
"lastModified": 1762366147,
"narHash": "sha256-wgdxpKPvkMqCdHwpO8/uboBHTWhLevVXpX0VxU+ahic=",
"rev": "43a73d8765c97ff76eac4ef543369891d4e2644d",
"revCount": 308,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.12.0/019a12c8-c95c-7c68-8da4-d8cc92608fbf/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.12.2/019a55b3-b1fd-794d-ae5b-c6f07d0d0ca7/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -117,37 +117,37 @@
"determinate-nixd-aarch64-darwin": {
"flake": false,
"locked": {
"narHash": "sha256-TORlljq+wwn8XWLoN0giLY15pNiIAXuU0igpIXjLhMY=",
"narHash": "sha256-6Nk7pIXTTsdp52WJ7PgA2ocJoxNYlaS0c2iOBsfIlfM=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/macOS"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/macOS"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/macOS"
}
},
"determinate-nixd-aarch64-linux": {
"flake": false,
"locked": {
"narHash": "sha256-1HEvUQcG0mVdEQrEqcLEdB9nHpMNbb39bdNxdvyizqk=",
"narHash": "sha256-Xd1H8NenrmJBbpVD0qcCWLqXiPz+WWm0MpZBDSgnMtE=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/aarch64-linux"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/aarch64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/aarch64-linux"
}
},
"determinate-nixd-x86_64-linux": {
"flake": false,
"locked": {
"narHash": "sha256-WrXQbrXVisAdZl/hh49PsErSPHwzks1Vw+O3jarVjDo=",
"narHash": "sha256-e8RT5Jo5n3m95BXuUaIl05Bf0rUshb3S0lUhTPAQlZs=",
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/x86_64-linux"
},
"original": {
"type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.0/x86_64-linux"
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.12.2/x86_64-linux"
}
},
"firefox-gnome-theme": {
@@ -433,12 +433,12 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1761238235,
"narHash": "sha256-BvEZ31+FQKJz2XH8PTXpJqGZ1eT9bhMQ2wBj2ehBYvM=",
"rev": "9512828397f684d0f732ea76b7631f69a0db34f7",
"revCount": 23138,
"lastModified": 1762362505,
"narHash": "sha256-Wm+ar8RmbGPCzmrYeou2T37WHTBRynMIsEb/uBiw/Ac=",
"rev": "72d304e9097a7307f2d4c1bf260f75a94871122b",
"revCount": 23176,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.12.0/019a1277-d4c6-7dca-9d55-ee5165fd0bf6/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.12.2/019a5521-738e-7c3d-be11-70270771a4e2/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -496,11 +496,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1762009083,
"narHash": "sha256-eOetnCjfZVigsL5TO8GZML+FuziFBMrDzQAAD6PE3wk=",
"lastModified": 1762438003,
"narHash": "sha256-CbZR1R+wDONmGHnO4bg25dmhUGj8RGJ7uowdxbr1Yiw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dddba88583dce558205300c3f5b75ed0c14dbdf7",
"rev": "f9346f62a0e4db9839bf1bd19c8217817621f938",
"type": "github"
},
"original": {
@@ -528,11 +528,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1761907660,
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
"lastModified": 1762111121,
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
"type": "github"
},
"original": {
@@ -544,12 +544,12 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1760965567,
"narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=",
"rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93",
"revCount": 880602,
"lastModified": 1762156382,
"narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
"rev": "7241bcbb4f099a66aafca120d37c65e8dda32717",
"revCount": 888688,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.880602%2Brev-cb82756ecc37fa623f8cf3e88854f9bf7f64af93/019a0545-358b-78f4-97fe-88a7820eac2f/source.tar.gz"
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.888688%2Brev-7241bcbb4f099a66aafca120d37c65e8dda32717/019a4d5f-1342-7012-9c08-5af5fe8439c0/source.tar.gz"
},
"original": {
"type": "tarball",
@@ -588,11 +588,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1761597516,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
"lastModified": 1762233356,
"narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
"rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
"type": "github"
},
"original": {
@@ -660,11 +660,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1761602948,
"narHash": "sha256-4K1gr1iZU/klyaB/5mh/foZwVJbjUH2c7hrjk4PZc6w=",
"lastModified": 1762083835,
"narHash": "sha256-O5cqRhOiKDCHBZze4VJBZqRjX4B+DttSkAJcTEhDv1k=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "15d85781db008ebbd85c2a8833694e01e1669b0c",
"rev": "87abad151f662238ce9946895850609c1ca42a68",
"type": "github"
},
"original": {
@@ -710,11 +710,11 @@
]
},
"locked": {
"lastModified": 1760652422,
"narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
"lastModified": 1761730856,
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
"owner": "NuschtOS",
"repo": "search",
"rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
"type": "github"
},
"original": {
@@ -777,11 +777,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1761668239,
"narHash": "sha256-b0+7/5hBUsLjd/gMY9/LSEsvuWFFolHdpUAOlG73zmw=",
"lastModified": 1762295027,
"narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=",
"owner": "danth",
"repo": "stylix",
"rev": "a149a557dc306e76d53e7dd488826e61ef9c6289",
"rev": "91b9a270523361268ba6a8772152fde31103869f",
"type": "github"
},
"original": {

4
hosts/hephaestus.nix
View File

@@ -255,10 +255,8 @@
needsreboot = {
supportsDryActivation = true;
text = ''
if [[ -e /run/current-system ]]; then
echo -e "\e[36mSystem changes requiring a reboot:\e[0m"
${inputs.nixos-needsreboot.packages.${pkgs.system}.default}/bin/nixos-needsreboot --dry-run
fi
${inputs.nixos-needsreboot.packages.${pkgs.system}.default}/bin/nixos-needsreboot --dry-run || true
'';
};
};

2
justfile
View File

@@ -8,7 +8,7 @@ arch := `uname -s`
cmd := if arch == "Linux" { "nixos-rebuild --use-remote-sudo" } else { "darwin-rebuild" }
rebuild:
sudo $cmd switch --flake . -I nixos-config="hosts/$(hostname).nix" --print-build-logs
sudo $cmd switch --flake . -I nixos-config="hosts/$(hostname).nix" --show-trace
rollback:
sudo $cmd switch --rollback --flake .