Compare commits

...

2 Commits

Author SHA1 Message Date
Dave Gallant
10e0c2fc7c Check arch in justfile 2024-03-15 08:17:21 -04:00
Dave Gallant
655053a6b3 nix flake update: 2024-03-15 12:04:21 UTC
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/bd5ddf2c6bfafff031edf80221e1ee94e86ca10a' (2024-03-14)
  → 'github:NixOS/nixpkgs/f242fc768bdfcf91d9094a8a8f66551324bf1a47' (2024-03-15)
2024-03-15 08:04:21 -04:00
4 changed files with 13 additions and 37 deletions

View File

@@ -11,16 +11,10 @@ The configuration is very specific to my own machines and setup, but it may be a
Recipes are stored in a justfile. [just](https://github.com/casey/just) is required. Recipes are stored in a justfile. [just](https://github.com/casey/just) is required.
To run a NixOS rebuild: To run a rebuild:
```sh ```sh
just build-linux just rebuild
```
To run a macOS rebuild:
```sh
just build-mac
``` ```
## Update ## Update
@@ -38,13 +32,7 @@ If there are updates, they should be reflected in [flake.lock](./flake.lock).
To rollback to the previous generation: To rollback to the previous generation:
```sh ```sh
just rollback-linux just rollback
```
or on macOS:
```sh
just rollback-mac
``` ```
## Garbage collection ## Garbage collection

6
flake.lock generated
View File

@@ -187,11 +187,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1710408871, "lastModified": 1710470187,
"narHash": "sha256-YpSGYZR96I8g5OK/Fdm0O4+mHLen6YPA1cPanqqNqT0=", "narHash": "sha256-l2R47RqhdEUYrMrQjdFKhxtqprkJjIE89qJx3iEVv+U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd5ddf2c6bfafff031edf80221e1ee94e86ca10a", "rev": "f242fc768bdfcf91d9094a8a8f66551324bf1a47",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,18 +1,15 @@
set export set export
config := "machines/$(hostname)/configuration.nix" config := "machines/$(hostname)/configuration.nix"
arch := `uname -s`
build-linux: cmd := if arch == "Linux" { "nixos-rebuild --use-remote-sudo" } else { "darwin-rebuild" }
nixos-rebuild --use-remote-sudo -I nixos-config=$config switch --flake .
build-mac: rebuild:
darwin-rebuild switch -I nixos-config=$config --flake . $cmd switch --flake . -I nixos-config=$config
rollback-linux: rollback:
nixos-rebuild --use-remote-sudo switch --rollback -I nixos-config=$config $cmd switch --rollback -I nixos-config=$config
rollback-mac:
darwin-rebuild --rollback -I nixos-config=$config
update: update:
@./nix-flake-update.sh @./nix-flake-update.sh

View File

@@ -2,18 +2,9 @@
set -euo pipefail set -euo pipefail
arch=$(uname -s)
git pull git pull
update_msg=$(nix flake update 2>&1 | grep -v 'warning:') update_msg=$(nix flake update 2>&1 | grep -v 'warning:')
if [[ $arch == "Linux" ]]; then just build
just build-linux
elif [[ $arch == "Darwin" ]]; then
just build-mac
else
echo "Unsupported OS: $arch"
exit 1
fi
git add . git add .
git commit -S -m "nix flake update: $(TZ=UTC date '+%Y-%m-%d %H:%M:%S %Z') git commit -S -m "nix flake update: $(TZ=UTC date '+%Y-%m-%d %H:%M:%S %Z')