@gengjiawen/os-init 1.9.1 → 1.10.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.10.0](https://github.com/gengjiawen/os-init/compare/v1.9.1...v1.10.0) (2025-12-06)
+
+
+### Features
+
+* add command to set up Fish shell import script ([8418406](https://github.com/gengjiawen/os-init/commit/841840694783a1264733b7b8415cdb12d2bb21fa))
+* add dev tun to setup ([a373417](https://github.com/gengjiawen/os-init/commit/a373417ca60f0f1554c85c06d73c017bc722fdf3))
+* add ownership fix for gitpod user config and cache in init script ([dd3720c](https://github.com/gengjiawen/os-init/commit/dd3720cd0a57b603d1cc74179187669e3659ae82))
+* persist ssh host keys via init script and mount gitconfig ([dbaabe9](https://github.com/gengjiawen/os-init/commit/dbaabe98ca44aa3e1cdb29deb12f700a4b559fb5))
+
 ## [1.9.1](https://github.com/gengjiawen/os-init/compare/v1.9.0...v1.9.1) (2025-11-26)
 
 

package/README.md

@@ -50,6 +50,28 @@ pnpx @gengjiawen/os-init set-android --android-home ~/my-android-sdk
 pnpx @gengjiawen/os-init set-android --skip-env-vars
 ```
 
+### Setup Fish Shell Import Script
+
+```bash
+pnpx @gengjiawen/os-init set-fish
+```
+
+Sets up Fish shell to automatically import environment variables from `.bashrc`. This command will:
+
+- Detect if Fish shell is installed (by checking for `~/.config/fish/config.fish`)
+- Add an import script to `~/.config/fish/config.fish` that reads environment variables from `~/.bashrc`
+- Automatically convert Bash-style environment variable syntax to Fish shell syntax
+- Handle PATH variables correctly (converting `:` separators to spaces)
+- Skip if the import script already exists
+
+This is useful when you have environment variables configured in `.bashrc` but want to use them in Fish shell without duplicating configuration.
+
+Example:
+
+```bash
+pnpx @gengjiawen/os-init set-fish
+```
+
 ---
 
 ### Configure Claude Code

package/bin/bin.js

@@ -10,6 +10,7 @@ const {
   setupDevEnvironment,
   setupAndroidEnvironment,
 } = require('../build')
+const { appendFishImportScript } = require('../build/fish-shell-utils')
 
 const program = new Command()
 
@@ -128,4 +129,17 @@ program
     }
   })
 
+program
+  .command('set-fish')
+  .description('setup Fish shell to import environment variables from .bashrc')
+  .action(async () => {
+    try {
+      appendFishImportScript()
+      console.log('\n✅ Fish shell import script setup completed!')
+    } catch (err) {
+      console.error('Failed to setup Fish shell:', err.message)
+      process.exit(1)
+    }
+  })
+
 program.parse(process.argv)

package/build/android-setup.js

@@ -52,7 +52,7 @@ function getAndroidEnvVars(androidHome, ndkVersion) {
 export ANDROID_HOME=${androidHome}
 export ANDROID_SDK_ROOT=\${ANDROID_HOME}
 export ANDROID_NDK_HOME=\${ANDROID_HOME}/ndk/${ndkVersion}
-export PATH=\${ANDROID_HOME}/cmdline-tools/bin:\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin:\${PATH}
+export PATH=\${PATH}:\${ANDROID_HOME}/cmdline-tools/bin:\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin
 # ===== Android development environment - END =====
 `;
 }
@@ -77,7 +77,6 @@ function hasAndroidEnvVars(rcFile) {
     return content.includes('ANDROID_HOME');
 }
 function appendEnvVarsToShellConfig(rcFile, envVars) {
-    const shell = process.env.SHELL || '';
     const homeDir = os.homedir();
     const bashrcFile = path.join(homeDir, '.bashrc');
     if (!fs.existsSync(bashrcFile) ||
@@ -88,9 +87,7 @@ function appendEnvVarsToShellConfig(rcFile, envVars) {
     else {
         console.log(`Environment variables already exist in: ${bashrcFile}`);
     }
-    if (shell.includes('fish')) {
-        (0, fish_shell_utils_1.appendFishImportScript)();
-    }
+    (0, fish_shell_utils_1.appendFishImportScript)();
 }
 async function setupAndroidEnvironment(options) {
     const androidHome = options?.androidHome || getDefaultAndroidHome();
@@ -191,6 +188,7 @@ async function setupAndroidEnvironment(options) {
             appendEnvVarsToShellConfig(shellRcFile, envVars);
             envVarsAdded = true;
         }
+        (0, fish_shell_utils_1.appendFishImportScript)();
         console.log('\n📋 To activate the environment in your current shell, run:');
         console.log(`  source ${shellRcFile}`);
     }

package/build/dev-setup.js

@@ -5,6 +5,7 @@ const fs = require("fs");
 const path = require("path");
 const execa_1 = require("execa");
 const ip = require("ip");
+const yaml = require("yaml");
 function ensureDir(dirPath) {
     fs.mkdirSync(dirPath, { recursive: true });
 }
@@ -53,6 +54,22 @@ async function setupDevEnvironment(sshPublicKey, targetDir) {
     else {
         throw new Error(`Dockerfile not found in ${targetPath}`);
     }
+    const tunDevicePath = '/dev/net/tun';
+    const dockerComposePath = path.join(targetPath, 'docker-compose.yml');
+    if (fs.existsSync(tunDevicePath) && fs.existsSync(dockerComposePath)) {
+        const content = fs.readFileSync(dockerComposePath, 'utf-8');
+        const doc = yaml.parse(content);
+        if (doc.services) {
+            const serviceName = Object.keys(doc.services)[0];
+            const service = doc.services[serviceName];
+            if (!service.devices?.includes('/dev/net/tun:/dev/net/tun')) {
+                service.devices = service.devices || [];
+                service.devices.push('/dev/net/tun:/dev/net/tun');
+                fs.writeFileSync(dockerComposePath, yaml.stringify(doc));
+                console.log('Added /dev/net/tun device to docker-compose.yml');
+            }
+        }
+    }
     const hasDockerCompose = await commandExists('docker-compose');
     if (hasDockerCompose) {
         console.log('\n🐳 Docker Compose detected. Building and starting containers...');

package/build/fish-shell-utils.js

@@ -40,17 +40,14 @@ end
 function appendFishImportScript() {
     const homeDir = os.homedir();
     const fishConfigPath = path.join(homeDir, '.config', 'fish', 'config.fish');
-    if (!fs.existsSync(fishConfigPath)) {
-        console.log('Fish shell config not found, skipping fish setup');
-        return;
-    }
     const configDir = path.dirname(fishConfigPath);
     if (!fs.existsSync(configDir)) {
         fs.mkdirSync(configDir, { recursive: true });
     }
-    const fishContent = fs.existsSync(fishConfigPath)
-        ? fs.readFileSync(fishConfigPath, 'utf-8')
-        : '';
+    if (!fs.existsSync(fishConfigPath)) {
+        fs.writeFileSync(fishConfigPath, '', 'utf-8');
+    }
+    const fishContent = fs.readFileSync(fishConfigPath, 'utf-8');
     if (!fishContent.includes('Import environment variables from .bashrc - START')) {
         const fishScript = getFishImportBashExports();
         fs.appendFileSync(fishConfigPath, fishScript);

package/dev-setup/Dockerfile

@@ -2,6 +2,8 @@ FROM gengjiawen/node-build
 
 # SSHD configuration
 COPY sshd_config /etc/ssh/sshd_config
+COPY init.sh /usr/local/bin/init.sh
+RUN chmod +x /usr/local/bin/init.sh
 
 ENV SSH_PUBLIC_KEY="ssh-public-key-placeholder"
 RUN set -eux; \

package/dev-setup/docker-compose.yml

@@ -12,5 +12,9 @@ services:
       - '5173:5173'
     cap_add:
       - SYS_PTRACE
+      - NET_ADMIN
     volumes:
       - .:/pwd
+      - ./.ssh_host_keys:/etc/ssh/host_keys
+      - ~/.gitconfig:/home/gitpod/.gitconfig:ro
+    command: ['/usr/local/bin/init.sh']

package/dev-setup/init.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Generate SSH host keys in mounted volume to keep fingerprints stable across rebuilds.
+HOST_KEY_DIR="/etc/ssh/host_keys"
+
+mkdir -p "${HOST_KEY_DIR}"
+
+for key_type in rsa ed25519; do
+  key_path="${HOST_KEY_DIR}/ssh_host_${key_type}_key"
+  if [ ! -f "${key_path}" ]; then
+    echo "Generating ${key_type} host key..."
+    ssh-keygen -q -N "" -t "${key_type}" -f "${key_path}"
+  else
+    echo "${key_type} host key already exists."
+  fi
+done
+
+echo "Done. SSH host keys are ready."
+
+# Fix ownership for gitpod user config/cache if needed
+TARGET_UID=${TARGET_UID:-33333}
+TARGET_GID=${TARGET_GID:-33333}
+TARGET_HOME=/home/gitpod
+
+fix_owner() {
+  local dir="$1"
+  [ -d "$dir" ] || return 0
+  local owner_uid owner_gid
+  owner_uid=$(stat -c %u "$dir")
+  owner_gid=$(stat -c %g "$dir")
+  if [ "$owner_uid" != "$TARGET_UID" ] || [ "$owner_gid" != "$TARGET_GID" ]; then
+    chown -R "${TARGET_UID}:${TARGET_GID}" "$dir"
+  fi
+}
+
+fix_owner "${TARGET_HOME}/.config"
+fix_owner "${TARGET_HOME}/.cache"
+
+exec /usr/sbin/sshd -D -e

package/dev-setup/sshd_config

@@ -1,9 +1,9 @@
 Port 22
 Protocol 2
 
-# Host keys are generated at runtime with `ssh-keygen -A`
-HostKey /etc/ssh/ssh_host_rsa_key
-HostKey /etc/ssh/ssh_host_ed25519_key
+# Host keys are persisted in mounted volume to keep fingerprints stable
+HostKey /etc/ssh/host_keys/ssh_host_rsa_key
+HostKey /etc/ssh/host_keys/ssh_host_ed25519_key
 
 SyslogFacility AUTHPRIV
 LogLevel VERBOSE

package/libs/android-setup.ts

@@ -58,7 +58,7 @@ function getAndroidEnvVars(androidHome: string, ndkVersion: string): string {
 export ANDROID_HOME=${androidHome}
 export ANDROID_SDK_ROOT=\${ANDROID_HOME}
 export ANDROID_NDK_HOME=\${ANDROID_HOME}/ndk/${ndkVersion}
-export PATH=\${ANDROID_HOME}/cmdline-tools/bin:\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin:\${PATH}
+export PATH=\${PATH}:\${ANDROID_HOME}/cmdline-tools/bin:\${ANDROID_HOME}/cmdline-tools/latest/bin:\${ANDROID_HOME}/emulator:\${ANDROID_HOME}/platform-tools:\${ANDROID_HOME}/tools:\${ANDROID_HOME}/tools/bin
 # ===== Android development environment - END =====
 `
 }
@@ -88,7 +88,6 @@ function hasAndroidEnvVars(rcFile: string): boolean {
 
 /** Append Android environment variables to shell config */
 function appendEnvVarsToShellConfig(rcFile: string, envVars: string): void {
-  const shell = process.env.SHELL || ''
   const homeDir = os.homedir()
   const bashrcFile = path.join(homeDir, '.bashrc')
 
@@ -104,9 +103,7 @@ function appendEnvVarsToShellConfig(rcFile: string, envVars: string): void {
   }
 
   // For fish shell, always write to bashrc first, then add import script to fish config
-  if (shell.includes('fish')) {
-    appendFishImportScript()
-  }
+  appendFishImportScript()
 }
 
 /** Setup Android development environment */
@@ -265,6 +262,10 @@ export async function setupAndroidEnvironment(options?: {
       envVarsAdded = true
     }
 
+    // Always check and add fish import script if fish shell exists
+    // This ensures fish users get the import script even if current shell is not fish
+    appendFishImportScript()
+
     console.log('\n📋 To activate the environment in your current shell, run:')
     console.log(`  source ${shellRcFile}`)
   }

package/libs/dev-setup.ts

@@ -2,6 +2,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import { execa } from 'execa'
 import * as ip from 'ip'
+import * as yaml from 'yaml'
 
 /** Ensure directory exists */
 function ensureDir(dirPath: string): void {
@@ -68,6 +69,30 @@ export async function setupDevEnvironment(
     throw new Error(`Dockerfile not found in ${targetPath}`)
   }
 
+  // Check if /dev/net/tun exists and add devices to docker-compose.yml
+  const tunDevicePath = '/dev/net/tun'
+  const dockerComposePath = path.join(targetPath, 'docker-compose.yml')
+  if (fs.existsSync(tunDevicePath) && fs.existsSync(dockerComposePath)) {
+    const content = fs.readFileSync(dockerComposePath, 'utf-8')
+    const doc = yaml.parse(content) as {
+      services?: { [key: string]: { devices?: string[] } }
+    }
+
+    // Find the first service and add devices
+    if (doc.services) {
+      const serviceName = Object.keys(doc.services)[0]
+      const service = doc.services[serviceName]
+
+      // Check if devices already contains /dev/net/tun
+      if (!service.devices?.includes('/dev/net/tun:/dev/net/tun')) {
+        service.devices = service.devices || []
+        service.devices.push('/dev/net/tun:/dev/net/tun')
+        fs.writeFileSync(dockerComposePath, yaml.stringify(doc))
+        console.log('Added /dev/net/tun device to docker-compose.yml')
+      }
+    }
+  }
+
   // Check if docker-compose is available
   const hasDockerCompose = await commandExists('docker-compose')
 

package/libs/fish-shell-utils.ts

@@ -46,22 +46,19 @@ export function appendFishImportScript(): void {
   const homeDir = os.homedir()
   const fishConfigPath = path.join(homeDir, '.config', 'fish', 'config.fish')
 
-  // Detect if fish shell exists by checking config file
-  if (!fs.existsSync(fishConfigPath)) {
-    console.log('Fish shell config not found, skipping fish setup')
-    return
-  }
-
   // Ensure fish config directory exists
   const configDir = path.dirname(fishConfigPath)
   if (!fs.existsSync(configDir)) {
     fs.mkdirSync(configDir, { recursive: true })
   }
 
+  // Create fish config file if it doesn't exist
+  if (!fs.existsSync(fishConfigPath)) {
+    fs.writeFileSync(fishConfigPath, '', 'utf-8')
+  }
+
   // Check if import script already exists
-  const fishContent = fs.existsSync(fishConfigPath)
-    ? fs.readFileSync(fishConfigPath, 'utf-8')
-    : ''
+  const fishContent = fs.readFileSync(fishConfigPath, 'utf-8')
 
   if (
     !fishContent.includes('Import environment variables from .bashrc - START')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gengjiawen/os-init",
   "private": false,
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -9,7 +9,6 @@
   },
   "scripts": {
     "dev": "tsc -w",
-    "server": "nodemon --exec ts-node libs/index.ts",
     "prepare": "husky",
     "clean": "rimraf build",
     "format": "prettier --write \"{examples,libs,script,bin}/**/*.{js,ts}\" \"**/*.yml\"",
@@ -22,7 +21,8 @@
     "@gengjiawen/unzip-url": "^1.1.0",
     "commander": "^12.1.0",
     "ip": "^2.0.1",
-    "execa": "^8.0.1"
+    "execa": "^8.0.1",
+    "yaml": "^2.8.2"
   },
   "publishConfig": {
     "access": "public"
@@ -36,16 +36,16 @@
   },
   "devDependencies": {
     "@types/ip": "^1.1.3",
-    "@types/jest": "29.5.12",
+    "@types/jest": "30.0.0",
     "@types/node": "24.1.0",
     "cpy-cli": "^6.0.0",
     "husky": "9.1.6",
-    "jest": "29.7.0",
+    "jest": "30.2.0",
     "lint-staged": "^15.2.2",
     "nodemon": "3.1.4",
     "prettier": "3.5.3",
     "rimraf": "6.1.2",
-    "ts-jest": "29.2.4",
+    "ts-jest": "29.4.6",
     "ts-node": "^10.9.1",
     "typescript": "5.6.3"
   },