From d714fe2902660bba084084307b22563a7d0988aa Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Sun, 6 Oct 2024 16:10:06 -0500
Subject: [PATCH] updates from makefile

---
 flake.lock | 12 ++++++------
 flake.nix  |  4 ++--
 makefile   | 10 +++-------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4af190c..144ff38 100644
--- a/flake.lock
+++ b/flake.lock
@@ -361,11 +361,11 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1728150277,
-        "narHash": "sha256-+7Sc73TQ6WCB7VIXS3almW1H/tJbXrX3hPy4ZXvemWw=",
+        "lastModified": 1728246341,
+        "narHash": "sha256-6QqFy3cYLfxLunOmxQoRP7xw2SaUgXnTwwOT8Vo4Jh8=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "5e5c97962ce369edcf9ef2d48f0c5cf4baa65035",
+        "rev": "0dc8419c1168a7075bd197f0483a0f0ceb870a5d",
         "type": "github"
       },
       "original": {
@@ -516,11 +516,11 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1727723275,
-        "narHash": "sha256-k4HrG8TJQ0RqDS1tlDz71kvWFBNQ7qZI9T5Z0qLR85Y=",
+        "lastModified": 1728242323,
+        "narHash": "sha256-GYGx9aK+PCseQO72u6eJc8LJxWhAm2p2+3WXJ42seE8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "e7e97059776da7e34b739415a7bc8f80f606b803",
+        "rev": "39e5435c1da9ce50fe36deaf58bd2b94dd4d8249",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a9108ae..d7e0d43 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,8 +55,8 @@
       fred = import ./hosts/fred/colmena.nix;
       loki = import ./hosts/loki/colmena.nix;
       smaug = import ./hosts/smaug/colmena.nix;
-      t2 = import ./hosts/t2/colmena.nix;
-      pi1 = import ./hosts/pi1/colmena.nix;
+      # t2 = import ./hosts/t2/colmena.nix;
+      # pi1 = import ./hosts/pi1/colmena.nix;
     };
 
     nixosConfigurations = {
diff --git a/makefile b/makefile
index a56e194..9e7fbb8 100644
--- a/makefile
+++ b/makefile
@@ -9,19 +9,15 @@ test:
 	@colmena build --on $(HOSTNAME)
 
 switch: prep
-	@rm -f nixos-switch.log
 	@colmena apply --on ${HOSTNAME}
 
 world: prep
-	@rm -f nixos-switch.log
 	@colmena apply
 
 workstation: prep
-	@rm -f nixos-switch.log
 	@colmena apply --on @workstation
 
 server: prep
-	@rm -f nixos-switch.log
 	@colmena apply --on @server
 
 vm:
@@ -30,7 +26,7 @@ vm:
 	@echo Running iso build
 	@nix build --impure ./#nixosConfigurations.vm.config.system.build.isoImage &> nixos-switch.log || ( grep -E --color '(error|For full logs)' nixos-switch.log && false)
 
-weekly: pull clean update workstation server ci push clean
+weekly: pull clean update world ci push clean
 
 cweekly: clean pull switch clean
 
@@ -42,8 +38,8 @@ update:
 clean:
 	@echo "Cleaning old entries and store"
 	@home-manager expire-generations "-5 days"
-	@doas nix-collect-garbage --quiet --log-format bar --no-build-output --delete-old
-	@doas nix store optimise
+	@colmena exec nix-collect-garbage --quiet --log-format bar --no-build-output --delete-old
+	@colmena exec nix store optimise
 
 push:
 	@echo pushing to git