haoshoku 2.0.1 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haoshoku",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "module": "haoshoku.js",
   "type": "module",
   "bin": {

package/services/dashy/README.md

@@ -0,0 +1,21 @@
+# Dashy Service
+
+This directory contains the Docker setup for [Dashy](https://dashy.to/), a self-hosted personal dashboard.
+
+## Prerequisites
+
+- Docker
+- Docker Compose
+
+## Usage
+
+1.  Start the service:
+    ```bash
+    docker compose up -d
+    ```
+
+2.  Access the dashboard at `http://localhost:8080`.
+
+## Configuration
+
+Edit `conf.yml` to customize your dashboard. See [Dashy Documentation](https://dashy.to/docs/configuring) for more details.

package/services/dashy/conf.yml

@@ -0,0 +1,12 @@
+pageTitle: My Dashboard
+sections:
+  - name: Getting Started
+    items:
+      - title: GitHub
+        description: Dashy source code
+        url: https://github.com/Lissy93/dashy
+        icon: fab fa-github
+      - title: Documentation
+        description: Dashy docs
+        url: https://dashy.to/docs
+        icon: fas fa-book

package/services/dashy/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.8'
+services:
+  dashy:
+    image: lissy93/dashy:latest
+    container_name: dashy
+    volumes:
+      - ./conf.yml:/app/public/conf.yml
+    ports:
+      - 8080:80
+    restart: unless-stopped
+    environment:
+      - NODE_ENV=production

package/src/os_scripts/debian_server.js

@@ -29,7 +29,10 @@ async function promptUser(message, initial = false) {
 async function installEssentials() {
   log.info("Updating system and installing essentials...");
   await runCommand("sudo apt update && sudo apt upgrade -y");
-  await runCommand("sudo apt install -y curl wget git vim ufw fail2ban software-properties-common");
+  // Split installation to ensure core tools are installed even if optional ones fail
+  await runCommand("sudo apt install -y curl wget git vim ufw fail2ban");
+  // Try installing software-properties-common separately as it might not be available on all minimal images
+  await runCommand("sudo apt install -y software-properties-common", { check: false });
 }
 
 async function setupSsh() {
@@ -56,8 +59,11 @@ async function setupSsh() {
 async function configureFishShell() {
   if (!(await commandExists("fish"))) {
     log.info("Installing Fish shell...");
-    await runCommand("sudo apt-add-repository -y ppa:fish-shell/release-3");
-    await runCommand("sudo apt update");
+    // Only try adding PPA if software-properties-common was installed successfully
+    if (await commandExists("add-apt-repository")) {
+      await runCommand("sudo apt-add-repository -y ppa:fish-shell/release-3");
+      await runCommand("sudo apt update");
+    }
     await runCommand("sudo apt install -y fish");
   }
 
@@ -77,8 +83,10 @@ async function configureFishShell() {
   // Ensure fish config dir exists
   fs.mkdirSync(FISH_CONFIG_DIR, { recursive: true });
 
+  // Install Fisher itself first
+  await runCommand('fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher"');
+
   const fisherPlugins = [
-    "jorgebucaran/fisher",
     "meaningful-ooo/sponge",
     "jorgebucaran/nvm.fish",
     "franciscolourenco/done",