From e6f79b30e620cf7bd5b06e2579e979ff090e925a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 18 Oct 2024 03:10:35 -0400
Subject: more refactors & outsource some things (#477)

* tree-wide: drop flake-parts

* drop nixinate

* justfile: cleanup

* drop treefmt-nix

* doc: update READMEs

* flake: cleanup

* seth: don't use `./.`

* modules/nixos,darwin: bundle all modules

They all depend on each other anyways so

* systems: manually import internal modules

* seth: use riff module from nix-exprs

* flake: back to flake-parts

* Revert "flake: back to flake-parts"

This reverts commit 35334882f7c0c23991a4efd65ea08b216006b2b0.

Saving the last commit so I can go back if I want

* flake: use lib.const

this looks better...right?

* flake: declare systems like a normal person
---
 justfile | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'justfile')

diff --git a/justfile b/justfile
index 163d339..971ad66 100644
--- a/justfile
+++ b/justfile
@@ -1,12 +1,10 @@
 alias b := build
 alias c := check
-alias dr := dry-run
 alias sw := switch
 alias t := test
 alias u := update
 alias ui := update-input
 
-rebuildArgs := "--verbose"
 rebuild := if os() == "macos" { "darwin-rebuild" } else { "nixos-rebuild" }
 
 default:
@@ -14,14 +12,26 @@ default:
 
 [private]
 rebuild subcmd *extraArgs="":
-    {{ rebuild }} {{ subcmd }} {{ rebuildArgs }} --flake . {{ extraArgs }}
+    {{ rebuild }} \
+      {{ subcmd }} \
+      {{ extraArgs }} \
+      --print-build-logs \
+      --flake .
+
+remote-rebuild system subcmd *extraArgs="":
+    {{ rebuild }} \
+      {{ subcmd }} \
+      --build-host {{ system }} \
+      --target-host {{ system }} \
+      --use-remote-sudo \
+      {{ extraArgs }} \
+      --print-build-logs \
+      --flake '.#{{ system }}'
 
 boot *extraArgs="": (rebuild "boot" extraArgs)
 
 build *extraArgs="": (rebuild "build" extraArgs)
 
-dry-run *extraArgs="": (rebuild "dry-run" extraArgs)
-
 switch *extraArgs="": (rebuild "switch" extraArgs)
 
 test *extraArgs="": (rebuild "test" extraArgs)
@@ -51,4 +61,4 @@ update-input input:
       --commit-lockfile-summary "flake: update {{ input }}"
 
 deploy system:
-    nix run '.#{{ system }}'
+    @just remote-rebuild {{ system }} "switch"
-- 
cgit v1.2.3