From b75e9d6abec2f1233f493c9f31588c25efced848 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sat, 17 Feb 2024 23:45:03 +0800
Subject: [PATCH] feat: adjust colmena tags

---
 Justfile         | 15 +++++++++------
 systems/vars.nix | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Justfile b/Justfile
index f9dffa34..a8675232 100644
--- a/Justfile
+++ b/Justfile
@@ -92,11 +92,11 @@ yabai-reload:
 colmena-ssh-key:
   ssh-add /etc/agenix/ssh-key-romantic
 
-dist:
-  colmena apply --on '@dist-build'
+lab:
+  colmena apply --on '@homelab'
 
-dist-debug:
-  colmena apply --on '@dist-build' --verbose --show-trace
+lab-debug:
+  colmena apply --on '@homelab' --verbose --show-trace
 
 aqua:
   colmena apply --on '@aqua'
@@ -135,10 +135,10 @@ pve-tsgw:
 #
 ############################################################################
 
-roll:
+riscv:
   colmena apply --on '@riscv'
 
-roll-debug:
+riscv-debug:
   colmena apply --on '@riscv' --verbose --show-trace
 
 nozomi:
@@ -156,6 +156,9 @@ yukina:
 aarch:
   colmena apply --on '@aarch'
 
+aarch-debug:
+  colmena apply --on '@aarch' --verbose --show-trace
+
 suzu:
   colmena apply --on '@suzu'
 
diff --git a/systems/vars.nix b/systems/vars.nix
index 19eb7613..e1fb9e73 100644
--- a/systems/vars.nix
+++ b/systems/vars.nix
@@ -18,6 +18,8 @@ let
     # home-module.imports = [];
   };
 in {
+  # --- Desktop Systems --- #
+
   # 星野 アイ, Hoshino Ai
   idol_ai_modules_i3 = {
     nixos-modules =
@@ -57,6 +59,8 @@ in {
       ++ desktop_base_modules.home-module.imports;
   };
 
+  # --- Homelab Systems --- #
+
   # 星野 愛久愛海, Hoshino Akuamarin
   idol_aquamarine_modules = {
     nixos-modules =
@@ -68,7 +72,7 @@ in {
       ++ pve_base_modules.nixos-modules;
     # home-module.imports = [];
   };
-  idol_aquamarine_tags = ["aqua" "router"];
+  idol_aquamarine_tags = ["aqua" "network" "homelab"];
 
   # 星野 瑠美衣, Hoshino Rubii
   idol_ruby_modules = {
@@ -80,7 +84,7 @@ in {
       ++ pve_base_modules.nixos-modules;
     # home-module.imports = [];
   };
-  idol_ruby_tags = ["dist-build" "ruby"];
+  idol_ruby_tags = ["ruby" "operation" "homelab"];
 
   # 有馬 かな, Arima Kana
   idol_kana_modules = {
@@ -92,7 +96,7 @@ in {
       ++ pve_base_modules.nixos-modules;
     # home-module.imports = [];
   };
-  idol_kana_tags = ["dist-build" "kana"];
+  idol_kana_tags = ["kana" "app" "homelab"];
 
   homelab_tailscale_gw_modules = {
     nixos-modules =
@@ -102,7 +106,9 @@ in {
       ++ pve_base_modules.nixos-modules;
     # home-module.imports = [];
   };
-  homelab_tailscale_gw_tags = ["tailscale_gw"];
+  homelab_tailscale_gw_tags = ["tailscale_gw" "network" "homelab"];
+
+  # --- RISC-V / AARCH64 Systems --- #
 
   # 森友 望未, Moritomo Nozomi
   rolling_nozomi_modules = {
@@ -174,7 +180,7 @@ in {
       ++ desktop_base_modules.home-module.imports;
   };
 
-  # darwin systems
+  # --- Darwin Systems --- #
   darwin_harmonica_modules = {
     darwin-modules = [
       ../hosts/darwin_harmonica