all repos — homestead @ 4fe285fc78fdadde99c439e3691670b009087655

Code for my website

move commands

Alan Pearce
commit

4fe285fc78fdadde99c439e3691670b009087655

parent

b16c1c7338333ad5f9c968f7fa579015d350672a

9 files changed, 19 insertions(+), 17 deletions(-)

changed files
D cmd/barkeep/.envrc
@@ -1,7 +0,0 @@
-source_env ../../.envrc
-
-export KO_DATA_PATH=$(expand_path ../../kodata)
-
-watch_file .env
-dotenv_if_exists
-env_vars_required PUBLISHER_BASE_URL
M cmd/barkeep/justfile → domain/content/publisher/barkeep/justfile
@@ -1,8 +1,9 @@
 listen_address := env_var_or_default("SERVER_LISTEN_ADDRESS", "::1")
 port := env_var_or_default("SERVER_PORT", "8081")
+root := `git rev-parse --show-toplevel`
 
 run:
-	systemfd -s http::{{ listen_address }}:{{ port }} -- wgo run --root ../.. . --dev
+	systemfd -s http::{{ listen_address }}:{{ port }} -- wgo run --root {{ root }} . --dev
 
 build:
 	go build .
A domain/content/publisher/barkeep/.envrc
@@ -0,0 +1,8 @@
+ROOT=$(git rev-parse --show-toplevel)
+source_env $ROOT
+
+export KO_DATA_PATH=$(expand_path $ROOT/kodata)
+
+watch_file .env
+dotenv_if_exists
+env_vars_required PUBLISHER_BASE_URL
M flake.nix → flake.nix
@@ -88,11 +88,11 @@ pname = "build";
               version = self.shortRev or self.dirtyShortRev;
               src = ./.;
               modules = ./gomod2nix.toml;
-              subPackages = [ "cmd/build" ];
+              subPackages = [ "domain/content/builder/build" ];
               nativeBuildInputs = with pkgs; [ makeWrapper ];
 
               postInstall = ''
-                wrapProgram $out/bin/build --set KO_DATA_PATH ${./templates}
+                wrapProgram $out/bin/build --set KO_DATA_PATH ${./kodata}
               '';
             };
           };
M gomod2nix.toml → gomod2nix.toml
@@ -1,6 +1,12 @@
 schema = 3
 
 [mod]
+  [mod."alin.ovh/gomponents"]
+    version = "v1.6.0"
+    hash = "sha256-vJLon9M6x/akEnQu+vK0RuzVyy/9vOnWGzp5DSS6brU="
+  [mod."alin.ovh/x"]
+    version = "v1.0.0"
+    hash = "sha256-9VbqLrFz3dy34Uo62JnDQyVp50wpsoq/pJrbAvbiuM0="
   [mod."dario.cat/mergo"]
     version = "v1.0.1"
     hash = "sha256-wcG6+x0k6KzOSlaPA+1RFxa06/RIAePJTAjjuhLbImw="

@@ -355,12 +361,6 @@ hash = "sha256-SNJMPPiXkRDLVOldrHN0ErC3bUB2VoWaLDkd9zmMATw="
   [mod."gitlab.com/tozd/go/errors"]
     version = "v0.10.0"
     hash = "sha256-oW37KsieVKJOWk9ZXbGuQvuU4nyJCZzgYrTZHFkoCs4="
-  [mod."alin.ovh/gomponents"]
-    version = "v1.4.0"
-    hash = "sha256-Q8YN8eNouMnW/JaBJpjUmaOZ5cfBj5gFURgVlbnaiDM="
-  [mod."alin.ovh/x"]
-    version = "v0.0.0-20250213214218-1bdfdc914d6c"
-    hash = "sha256-6XdXMqWwY8rk3i+HUb9wd0idoqh4GXqC6x1NZZC1O6M="
   [mod."go.hacdias.com/indielib"]
     version = "v0.4.3"
     hash = "sha256-6b4Pb0qUrqHbi1Zvr03bvs81jLQe0rwhkeL41HJJtVg="
M justfile → justfile
@@ -25,7 +25,7 @@ go get -u all
 	gomod2nix
 
 build:
-	go build ./cmd/build
+	go build ./domain/content/builder/build
 
 build-site *BUILD_FLAGS: build
 	SOURCE={{ website_repo }} ./build {{ BUILD_FLAGS }}