chore: mk etc dir

.github/workflows/website.yaml

@@ -63,7 +63,7 @@ jobs:
           curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/oranda/releases/latest/download/oranda-installer.sh | sh
           oranda build
       # Manually added
-      - run: cp assets/CNAME public/CNAME
+      - run: cp etc/website/CNAME public/CNAME
       # Deploy to our gh-pages branch (creating it if it doesn't exist)
       # the "public" dir that oranda made above will become the root dir
       # of this branch.

README.md

@@ -20,7 +20,7 @@
 [grafana-badge]: https://img.shields.io/badge/Grafana-Dashboard-orange?style=for-the-badge&logo=grafana
 [grafana-url]: https://ymgyt.grafana.net/public-dashboards/863ebddd82c44ddd9a28a68eaac848ff?orgId=1&refresh=1h&from=now-1h&to=now
 
-![Demo](./assets/demo.gif)
+![Demo](./etc/demo/demo.gif)
 
 Syndicationd(`synd`) is a TUI feed viewer, based on [feed-rs](https://github.com/feed-rs/feed-rs) and [ratatui](https://github.com/ratatui-org/ratatui).
 

crates/synd_api/oranda.json

@@ -1,30 +1,30 @@
 {
-  "build": {
-    "static_dir": "assets",
-    "dist_dir": "website"
-  },
-  "styles": {
-    "theme": "axo_dark",
-    "favicon": "https://blog.ymgyt.io/favicon.ico"
-  },
-  "marketing": {
-    "social": {
-      "image": "https://blog.ymgyt.io/images/emoji/crab.png",
-      "image_alt": "synd",
-      "twitter_account": "@YAmaguchixt"
-    }
-  },
-  "components": {
-    "changelog": {
-      "read_changelog_file": false
-    },
-    "artifacts": {
-      "package_managers": {
-        "additional": {
-          "nix": "nix profile install github:ymgyt/syndicationd#synd-api",
-          "cargo": "cargo install synd-api --locked"
-        }
-      }
-    }
-  }
+	"build": {
+		"static_dir": "etc/website/assets",
+		"dist_dir": "website"
+	},
+	"styles": {
+		"theme": "axo_dark",
+		"favicon": "https://blog.ymgyt.io/favicon.ico"
+	},
+	"marketing": {
+		"social": {
+			"image": "https://blog.ymgyt.io/images/emoji/crab.png",
+			"image_alt": "synd",
+			"twitter_account": "@YAmaguchixt"
+		}
+	},
+	"components": {
+		"changelog": {
+			"read_changelog_file": false
+		},
+		"artifacts": {
+			"package_managers": {
+				"additional": {
+					"nix": "nix profile install github:ymgyt/syndicationd#synd-api",
+					"cargo": "cargo install synd-api --locked"
+				}
+			}
+		}
+	}
 }

crates/synd_term/oranda.json

@@ -1,38 +1,38 @@
 {
-  "project": {
-    "name": "synd-term"
-  },
-  "build": {
-    "static_dir": "assets",
-    "dist_dir": "website"
-  },
-  "styles": {
-    "theme": "axo_dark",
-    "favicon": "https://blog.ymgyt.io/favicon.ico"
-  },
-  "marketing": {
-    "social": {
-      "image": "https://blog.ymgyt.io/images/emoji/crab.png",
-      "image_alt": "synd",
-      "twitter_account": "@YAmaguchixt"
-    }
-  },
-  "components": {
-    "changelog": {
-      "read_changelog_file": false
-    },
-    "mdbook": {
-      "path": "../../docs"
-    },
-    "artifacts": {
-      "package_managers": {
-        "additional": {
-          "nix": "nix profile install github:ymgyt/syndicationd#synd-term",
-          "pacman": "pacman -S syndicationd",
-          "cargo": "cargo install synd-term --locked",
-          "docker": "docker run -it ghcr.io/ymgyt/synd-term"
-        }
-      }
-    }
-  }
+	"project": {
+		"name": "synd-term"
+	},
+	"build": {
+		"static_dir": "etc/website/assets",
+		"dist_dir": "website"
+	},
+	"styles": {
+		"theme": "axo_dark",
+		"favicon": "https://blog.ymgyt.io/favicon.ico"
+	},
+	"marketing": {
+		"social": {
+			"image": "https://blog.ymgyt.io/images/emoji/crab.png",
+			"image_alt": "synd",
+			"twitter_account": "@YAmaguchixt"
+		}
+	},
+	"components": {
+		"changelog": {
+			"read_changelog_file": false
+		},
+		"mdbook": {
+			"path": "../../docs"
+		},
+		"artifacts": {
+			"package_managers": {
+				"additional": {
+					"nix": "nix profile install github:ymgyt/syndicationd#synd-term",
+					"pacman": "pacman -S syndicationd",
+					"cargo": "cargo install synd-term --locked",
+					"docker": "docker run -it ghcr.io/ymgyt/synd-term"
+				}
+			}
+		}
+	}
 }

crates/synd_test/src/lib.rs

@@ -12,7 +12,8 @@ pub fn certificate() -> PathBuf {
     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("..")
         .join("..")
-        .join(".dev")
+        .join("etc")
+        .join("dev")
         .join("self_signed_certs")
         .join("certificate.pem")
 }
@@ -25,7 +26,8 @@ pub fn private_key() -> PathBuf {
     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("..")
         .join("..")
-        .join(".dev")
+        .join("etc")
+        .join("dev")
         .join("self_signed_certs")
         .join("private_key.pem")
 }

assets/demo.tape → etc/demo/demo.tape

@@ -1,4 +1,4 @@
-Output assets/demo.gif
+Output etc/demo/demo.gif
 Set Shell nu
 Set FontSize 17
 Set FontFamily "JetBrainsMono Nerd Font"

assets/demo_short.tape → etc/demo/demo_short.tape

@@ -1,4 +1,4 @@
-Output assets/demo_short.gif
+Output etc/demo/demo_short.gif
 Set Shell nu
 Set FontSize 17
 Set FontFamily "JetBrainsMono Nerd Font"

assets/vhs_settings.tape → etc/demo/vhs_settings.tape

@@ -1,4 +1,4 @@
-Output assets/demo.gif
+Output etc/demo/demo.gif
 Set Shell nu
 Set FontSize 17
 Set FontFamily "JetBrainsMono Nerd Font"

nix/crane.nix → etc/nix/crane.nix

@@ -29,7 +29,7 @@ let
 
   syndTerm = craneLib.buildPackage (individualCrateArgs // (let
     crate = craneLib.crateNameFromCargoToml {
-      cargoToml = ../crates/synd_term/Cargo.toml;
+      cargoToml = ../../crates/synd_term/Cargo.toml;
     };
   in {
     inherit (crate) pname version;
@@ -46,7 +46,7 @@ let
 
   syndApi = craneLib.buildPackage (individualCrateArgs // (let
     crate = craneLib.crateNameFromCargoToml {
-      cargoToml = ../crates/synd_api/Cargo.toml;
+      cargoToml = ../../crates/synd_api/Cargo.toml;
     };
   in {
     inherit (crate) pname version;
@@ -82,7 +82,7 @@ in {
       cargoAuditExtraArgs = let
         ignoreAdvisories = lib.concatStrings (lib.strings.intersperse " "
           (map (x: "--ignore ${x}") (builtins.fromTOML
-            (builtins.readFile ../.cargo/audit.toml)).advisories.ignore));
+            (builtins.readFile ../../.cargo/audit.toml)).advisories.ignore));
       in "${ignoreAdvisories}";
     };
 

flake.nix

@@ -48,7 +48,7 @@
             (craneLib.filterCargoSources path type);
         };
 
-        synd = pkgs.callPackage ./nix/crane.nix {
+        synd = pkgs.callPackage ./etc/nix/crane.nix {
           inherit src craneLib advisory-db;
         };
 
@@ -79,7 +79,7 @@
       in {
         checks = {
           inherit (synd.checks) clippy nextest audit fmt;
-          typo = pkgs.callPackage ./nix/typo.nix { };
+          typo = pkgs.callPackage ./etc/nix/typo.nix { };
         };
 
         packages = {

justfile

@@ -11,7 +11,7 @@ feed_dir := "crates/synd_feed"
 o11y_dir := "crates/synd_o11y"
 api_dir := "crates/synd_api"
 
-demo_tape := "assets/demo.tape"
+demo_tape := "etc/demo/demo.tape"
 
 arch := arch()
 os := if os() == "macos" { "darwin" } else { "linux" }
@@ -67,7 +67,7 @@ test *flags:
 
 # Run integration test by insta
 integration *test_filter:
-    @nu scripts/integration.nu {{ test_filter }}
+    @nu etc/scripts/integration.nu {{ test_filter }}
 
 # Run integration test with debugging
 integration-debug *case:
@@ -137,7 +137,7 @@ gen-gql:
 # Run kvsd
 kvsd:
     KVSD_LOG=info nix run github:ymgyt/kvsd/426ddaf5a6356551f0945b7ca3c48366580928d9 -- server \
-        --disable-tls --config .dev/kvsd_config.yaml \
+        --disable-tls --config etc/dev/kvsd_config.yaml \
         --username {{ kvsd_user }} \
         --kvsd-dir .kvsd
 
@@ -150,7 +150,7 @@ api *flags:
       OTEL_RESOURCE_ATTRIBUTES="service.namespace=syndlocal,deployment.environment=local" \
       cargo run --features opentelemetry-stdout,introspection -- \
         --kvsd-host 127.0.0.1 --kvsd-port 7379 --kvsd-username {{ kvsd_user }} --kvsd-password secret \
-        --tls-cert ../../.dev/self_signed_certs/certificate.pem --tls-key ../../.dev/self_signed_certs/private_key.pem \
+        --tls-cert ../../etc/dev/self_signed_certs/certificate.pem --tls-key ../../etc/dev/self_signed_certs/private_key.pem \
         --show-code-location=true --show-target=false --trace-sampler-ratio "1.0" {{ flags }}
 
 # Run term
@@ -159,11 +159,11 @@ term *flags:
 
 # Run opentelemetry-collector-contrib
 @otelcol config:
-    otelcontribcol --config=file:.dev/otelcol/{{ config }}
+    otelcontribcol --config=file:etc/dev/otelcol/{{ config }}
 
 # Run backends
 backend:
-    zellij action new-tab --layout .dev/backend_layout.kdl
+    zellij action new-tab --layout etc/dev/backend_layout.kdl
 
 # Record demo
 demo *flags:
@@ -172,18 +172,18 @@ demo *flags:
 # Convert demo to gif
 # --rederer=resvg need to render nerd fonts and CJK
 demo2gif *flags:
-    LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" nix run nixpkgs#asciinema-agg -- demo.cast assets/demo.gif --renderer=resvg {{ flags }}
+    LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" nix run nixpkgs#asciinema-agg -- demo.cast etc/demo/demo.gif --renderer=resvg {{ flags }}
     rm demo.cast
 
 demo-vhs-record *flags:
-    cat assets/vhs_settings.tape out> {{ demo_tape }}
+    cat etc/demo/vhs_settings.tape out> {{ demo_tape }}
     nix run nixpkgs#vhs -- record --shell nu out>> {{ demo_tape }}
 
 demo-vhs-gif:
     nix run nixpkgs#vhs -- {{ demo_tape }}
 
 demo-vhs-gif-short:
-    nix run nixpkgs#vhs -- assets/demo_short.tape --output assets/demo_short.gif
+    nix run nixpkgs#vhs -- etc/demo/demo_short.tape --output etc/demo/demo_short.gif
 
 changelog-auth:
     GIT_CLIFF__GIT__TAG_PATTERN="synd-auth-v.*" \
@@ -272,7 +272,7 @@ docker-login:
 
 # Reinstall synd-term
 reinstall:
-    @nu scripts/reinstall.nu
+    @nu etc/scripts/reinstall.nu
 
 # Build ebpf program
 build-ebpf *flags: