From 447b936e4546647a2157c4946951a858cb73b1f5 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Sun, 30 Jun 2024 09:55:24 -0500 Subject: [PATCH] more makefiles updates --- makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 04d767c..ac9f3ec 100644 --- a/makefile +++ b/makefile @@ -5,7 +5,10 @@ UNAME_M := $(shell uname -m) all: switch switch: prep - doas nixos-rebuild switch --flake .#${HOSTNAME} &> nixos-switch.log || ( grep --color error nixos-switch.log && false) + @alejandra . &> nixos-switch.log || ( cat nixos-switch.log && false) + @rm nixos-switch.log + @echo Running nixos-rebuild switch + @doas nixos-rebuild switch --flake .#${HOSTNAME} &> nixos-switch.log || ( grep --color error nixos-switch.log && false) weekly: pull clean update switch ci push clean @@ -24,10 +27,10 @@ push: git push pull: - @. ~/.bash_ssh + # @. ~/.bash_ssh git pull doas nix-prefetch-url file://$$PWD/$$(ls -1 src/linuxx64* | tail -n1) -# doas nix-prefetch-url file://$$PWD/$$(ls -1 src/linuxarm64* | tail -n1) + # doas nix-prefetch-url file://$$PWD/$$(ls -1 src/linuxarm64* | tail -n1) ci: git commit -m"updates from makefile" --all