Compare commits
1 Commits
master
...
fish-confi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30c56f67f8 |
@@ -1,22 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -E -o errexit -o nounset -o pipefail
|
|
||||||
|
|
||||||
# Exit silently if required tools are missing
|
|
||||||
command -v shellcheck > /dev/null 2>&1 || exit 0
|
|
||||||
command -v file > /dev/null 2>&1 || exit 0
|
|
||||||
command -v jq > /dev/null 2>&1 || exit 0
|
|
||||||
|
|
||||||
input=$(cat)
|
|
||||||
file_path=$(printf '%s' "$input" | jq -r '.tool_input.file_path // empty')
|
|
||||||
|
|
||||||
[[ -z "$file_path" || ! -f "$file_path" ]] && exit 0
|
|
||||||
|
|
||||||
file_type=$(file --brief "$file_path")
|
|
||||||
case "$file_type" in
|
|
||||||
*"Bourne-Again shell"*|*"bash"*|*"/bin/bash"*) ;;
|
|
||||||
*"shell script"*|*"/bin/sh"*) ;;
|
|
||||||
*) exit 0 ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
shellcheck --format=gcc "$file_path" >&2
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
---
|
|
||||||
paths:
|
|
||||||
- "**/*.sh"
|
|
||||||
- "bashrc"
|
|
||||||
- "bin/*"
|
|
||||||
---
|
|
||||||
|
|
||||||
# Bash Readability Style
|
|
||||||
|
|
||||||
The primary goal is code that is **easy to understand at a glance**. Write bash that reads naturally, follows established conventions, and doesn't require the reader to puzzle over clever tricks. Favor clarity and well-known idioms over brevity.
|
|
||||||
|
|
||||||
Complements CLAUDE.md. Does not repeat rules already defined there.
|
|
||||||
|
|
||||||
## Formatting
|
|
||||||
|
|
||||||
- 2-space indentation, no tabs
|
|
||||||
- `then`/`do` on same line: `if cond; then` / `for x in list; do`
|
|
||||||
- Blank lines between logical sections; no blanks between tightly coupled statements
|
|
||||||
- Long pipe chains: one command per line with leading `|`
|
|
||||||
|
|
||||||
## Naming
|
|
||||||
|
|
||||||
- `UPPER_CASE` — exported env vars and constants; use `readonly` for true constants
|
|
||||||
- `snake_case` — local variables and function names
|
|
||||||
- `verb_noun` pattern for functions: `set_ps1_prompt`, `docker_aws_login`
|
|
||||||
- Meaningful names, no single letters except loop counters (`i`, `f`)
|
|
||||||
|
|
||||||
## Functions
|
|
||||||
|
|
||||||
```bash
|
|
||||||
function do_thing() {
|
|
||||||
local name="$1"
|
|
||||||
local count="${2:-0}"
|
|
||||||
...
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
- Always `function name() {` declaration style
|
|
||||||
- Always `local` for function variables, assigned on declaration line
|
|
||||||
- Name parameters immediately: `local filename="$1"` — no raw `$1` in logic
|
|
||||||
- Default values via `${VAR:-default}`
|
|
||||||
- Guard clauses with early `return` over deep nesting
|
|
||||||
- Keep functions focused — single responsibility
|
|
||||||
|
|
||||||
## Syntax Preferences
|
|
||||||
|
|
||||||
- `[[ ]]` over `[ ]` for conditionals
|
|
||||||
- `(( ))` for arithmetic comparisons
|
|
||||||
- `$(command)` for substitution, never backticks
|
|
||||||
- Double quotes around expansions: `"$var"`, `"${array[@]}"`
|
|
||||||
- Quote the whole string, not just the variable: `"$HOME/.local/bin"` not `"$HOME"/.local/bin`
|
|
||||||
- Single quotes for literals that must not expand
|
|
||||||
- `printf` over `echo` when output contains escapes or format strings
|
|
||||||
|
|
||||||
## Resource Cleanup
|
|
||||||
|
|
||||||
- Consider `trap cleanup EXIT` with `mktemp` when scripts create temporary files/dirs or acquire resources; skip when it would add unnecessary complexity (short scripts, no temp state)
|
|
||||||
|
|
||||||
## Structured Data
|
|
||||||
|
|
||||||
- Prefer `jq` for JSON and `yq` for YAML over ad-hoc `grep`/`awk`/string splitting
|
|
||||||
- Treat parser errors as fatal; check exit status before using results
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
- Long options for clarity: `--recursive` not `-r` (common test flags `-f`, `-d`, `-e` are fine)
|
|
||||||
- Redirect stderr: `> /dev/null 2>&1`
|
|
||||||
- `# shellcheck shell=bash` at top of sourced (non-executable) files
|
|
||||||
|
|
||||||
## Comments
|
|
||||||
|
|
||||||
- Minimal — explain *why*, not *what*
|
|
||||||
- URL reference when pattern comes from external source
|
|
||||||
- No banner/divider comments
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"hooks": {
|
|
||||||
"PostToolUse": [
|
|
||||||
{
|
|
||||||
"matcher": "Edit|Write",
|
|
||||||
"hooks": [
|
|
||||||
{
|
|
||||||
"type": "command",
|
|
||||||
"command": ".claude/hooks/shellcheck.sh"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,7 +7,6 @@ insert_final_newline = true
|
|||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
indent_style = space
|
indent_style = space
|
||||||
max_line_length = 120
|
|
||||||
|
|
||||||
[*.md]
|
[*.md]
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
@@ -15,6 +14,7 @@ indent_size = 2
|
|||||||
|
|
||||||
[*.{java,kt,kts}]
|
[*.{java,kt,kts}]
|
||||||
continuation_indent_size = 4
|
continuation_indent_size = 4
|
||||||
|
max_line_length = 120
|
||||||
wildcard_import_limit = 99
|
wildcard_import_limit = 99
|
||||||
|
|
||||||
[*.xml]
|
[*.xml]
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,4 +9,3 @@
|
|||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
.claude/settings.local.json
|
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
# Default shell for sourced files without shebang (SC2148)
|
|
||||||
shell=bash
|
|
||||||
|
|
||||||
# Sourced files define variables used by other files after source
|
|
||||||
disable=SC2034
|
|
||||||
|
|
||||||
# Non-constant and external source paths are intentional
|
|
||||||
disable=SC1090
|
|
||||||
disable=SC1091
|
|
||||||
|
|
||||||
# Functions invoked indirectly via trap/callback
|
|
||||||
disable=SC2317
|
|
||||||
64
CLAUDE.md
64
CLAUDE.md
@@ -1,64 +0,0 @@
|
|||||||
# Linux Workspace
|
|
||||||
|
|
||||||
Dotfiles & workstation automation for Linux, macOS, WSL. `bashrc` loads `rc/*.sh` (ordered by prefix)
|
|
||||||
and adds `bin/` to PATH. `$LWS` points to repo root.
|
|
||||||
|
|
||||||
## Directory Layout
|
|
||||||
|
|
||||||
- `rc/` — Shell init files, loaded in `0X-name.sh` order. Per-tool env setup goes here.
|
|
||||||
- `install/` — Idempotent one-off installer scripts (run manually).
|
|
||||||
- `bin/` — Scripts auto-added to PATH. New CLI tools go here.
|
|
||||||
- `scripts/` — Setup scripts NOT on PATH (git-config, docker fixes, gnome config).
|
|
||||||
- `conf/` — Tool configs (vim, WireGuard, WSL).
|
|
||||||
- `doc/` — Reference docs, cheatsheets, bookmarks.
|
|
||||||
- `functions.sh` — Core lib (see below).
|
|
||||||
|
|
||||||
## Key Helpers (`functions.sh`)
|
|
||||||
|
|
||||||
- `can_run <cmd>` — check if command is available
|
|
||||||
- `is_slow_init` / `is_fast_init` — check `LWS_FAST` mode
|
|
||||||
- `is_interactive_shell` — true when `[[ $- == *i* ]]`
|
|
||||||
- `is_wsl` — detect WSL environment
|
|
||||||
- `true_false <val>` — normalize `1/true/yes` to boolean
|
|
||||||
- `prepend_path` / `append_path` / `prepend_path_try` / `append_path_try` — safe PATH manipulation
|
|
||||||
- `source_try <file>` — source file if it exists
|
|
||||||
- `source_directory_sh <dir>` — source all `*.sh` in a directory
|
|
||||||
- `xlog <msg>` — debug log (only in interactive + `LWS_DEBUG`)
|
|
||||||
|
|
||||||
## Conventions
|
|
||||||
|
|
||||||
All new **executable** bash scripts should use:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -E -o errexit -o nounset -o pipefail
|
|
||||||
```
|
|
||||||
|
|
||||||
**Sourced files** (rc files, `functions.sh`) must NOT use `set -o errexit` — they run inside
|
|
||||||
the user's shell. Add `# shellcheck shell=bash` at the top instead of a shebang.
|
|
||||||
|
|
||||||
Before writing shell code, check `functions.sh` for existing helper functions and prefer them over raw commands.
|
|
||||||
|
|
||||||
Detailed formatting, naming, and syntax rules are in `.claude/rules/bash-style.md`.
|
|
||||||
|
|
||||||
RC files MUST guard slow tools and check availability:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
if is_slow_init && can_run pyenv; then
|
|
||||||
# initialize pyenv
|
|
||||||
fi
|
|
||||||
```
|
|
||||||
|
|
||||||
Installers (`install/*.sh`) MUST be idempotent — check before installing.
|
|
||||||
|
|
||||||
## Environment Variables
|
|
||||||
|
|
||||||
- `LWS_FAST=1` — skips slow tools during shell init
|
|
||||||
- `LWS_DEBUG=1` — enables debug logging via `xlog`
|
|
||||||
|
|
||||||
## Commits
|
|
||||||
|
|
||||||
- Do not add `Co-Authored-By` lines to commit messages.
|
|
||||||
- Commit messages must be in English.
|
|
||||||
- Prefer one-line commit messages. Add a longer description only when necessary for better understanding.
|
|
||||||
@@ -24,10 +24,6 @@ For faster load can be set
|
|||||||
For debug log enabled
|
For debug log enabled
|
||||||
`LWS_DEBUG=1`
|
`LWS_DEBUG=1`
|
||||||
|
|
||||||
## Directory notes
|
|
||||||
|
|
||||||
`opt/` (git-ignored) is used for locally installed tools (e.g. bash-git-prompt, enhancd).
|
|
||||||
|
|
||||||
## Quick commands
|
## Quick commands
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
7
bashrc
7
bashrc
@@ -7,16 +7,13 @@ export LWS=$WORKSPACE
|
|||||||
LWS_DEBUG=${LWS_DEBUG:-0}
|
LWS_DEBUG=${LWS_DEBUG:-0}
|
||||||
LWS_FAST=${LWS_FAST:-0}
|
LWS_FAST=${LWS_FAST:-0}
|
||||||
|
|
||||||
source "$LWS/functions.sh"
|
echo "Linux Workspace initialization"
|
||||||
|
|
||||||
if [[ -z $LC_ALL ]]; then
|
if [[ -z $LC_ALL ]]; then
|
||||||
export LC_ALL=en_US.UTF-8
|
export LC_ALL=en_US.UTF-8
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if is_interactive_shell; then
|
source "$LWS/functions.sh"
|
||||||
echo "Linux Workspace initialization"
|
|
||||||
fi
|
|
||||||
|
|
||||||
source_directory_sh "$LWS/rc"
|
source_directory_sh "$LWS/rc"
|
||||||
source_directory_sh "$HOME/.bashrc.d"
|
source_directory_sh "$HOME/.bashrc.d"
|
||||||
|
|
||||||
|
|||||||
75
bin/xclaude
75
bin/xclaude
@@ -1,75 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
# https://code.claude.com/docs/en/settings
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import urllib.parse
|
|
||||||
|
|
||||||
env = os.environ
|
|
||||||
|
|
||||||
|
|
||||||
def die(msg):
|
|
||||||
print(f"Error: {msg}", file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
def validate_url(url):
|
|
||||||
parsed = urllib.parse.urlparse(url)
|
|
||||||
if parsed.scheme not in ("http", "https"):
|
|
||||||
die(f"invalid URL scheme '{parsed.scheme}' in --url (expected http or https)")
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(
|
|
||||||
prog="xclaude",
|
|
||||||
description="Run Claude Code with any OpenAI-compatible API backend.",
|
|
||||||
epilog="""\
|
|
||||||
Environment variables (overridable by arguments):
|
|
||||||
CLAUDE_URL - API base URL (e.g. https://openrouter.ai/api/v1)
|
|
||||||
CLAUDE_TOKEN - API token/key
|
|
||||||
CLAUDE_MODEL - model name
|
|
||||||
|
|
||||||
If neither URL nor token is set, defaults to Ollama:
|
|
||||||
OLLAMA_HOST - Ollama server address (default: nvidia.hell), or use --host
|
|
||||||
OLLAMA_MODEL - Ollama model (default: glm-5:cloud)
|
|
||||||
|
|
||||||
Any extra arguments are passed through directly to the claude CLI.
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
xclaude
|
|
||||||
xclaude --model qwen3-coder
|
|
||||||
xclaude --url https://openrouter.ai/api/v1 --token sk-XXX --model openai/gpt-4o
|
|
||||||
""",
|
|
||||||
formatter_class=argparse.RawDescriptionHelpFormatter,
|
|
||||||
)
|
|
||||||
parser.add_argument("--url", default=env.get("CLAUDE_URL", ""))
|
|
||||||
parser.add_argument("--token", default=env.get("CLAUDE_TOKEN", ""))
|
|
||||||
parser.add_argument("--model", default=env.get("CLAUDE_MODEL", ""))
|
|
||||||
parser.add_argument("--host", default=env.get("OLLAMA_HOST", "nvidia.hell"))
|
|
||||||
args, rest = parser.parse_known_args()
|
|
||||||
|
|
||||||
env["DISABLE_TELEMETRY"] = "1"
|
|
||||||
|
|
||||||
is_external_api = bool(args.url or args.token)
|
|
||||||
if is_external_api:
|
|
||||||
if not args.url:
|
|
||||||
die("no URL specified (--url or CLAUDE_URL)")
|
|
||||||
validate_url(args.url)
|
|
||||||
if not args.token:
|
|
||||||
die("no token specified (--token or CLAUDE_TOKEN)")
|
|
||||||
if not args.model:
|
|
||||||
die("no model specified (--model or CLAUDE_MODEL)")
|
|
||||||
env["ANTHROPIC_BASE_URL"] = args.url
|
|
||||||
env["ANTHROPIC_API_KEY"] = args.token
|
|
||||||
# Remove Ollama auth token if switching to external API
|
|
||||||
env.pop("ANTHROPIC_AUTH_TOKEN", None)
|
|
||||||
model = args.model
|
|
||||||
else:
|
|
||||||
host = args.host
|
|
||||||
model = args.model or env.get("OLLAMA_MODEL", "glm-5:cloud")
|
|
||||||
env["ANTHROPIC_BASE_URL"] = f"http://{host}:11434"
|
|
||||||
env["ANTHROPIC_AUTH_TOKEN"] = "ollama"
|
|
||||||
env.pop("ANTHROPIC_API_KEY", None)
|
|
||||||
|
|
||||||
cmd = ["claude", "--model", model] + rest
|
|
||||||
os.execvp("claude", cmd)
|
|
||||||
6
conf/fish/lws.fish
Normal file
6
conf/fish/lws.fish
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
# ~/.config/fish/config.fish
|
||||||
|
# ~/.config/fish/conf.d/
|
||||||
|
|
||||||
|
# cp $LWS/conf/fish/lws.fish $HOME/.config/fish/conf.d/
|
||||||
|
|
||||||
|
set -U fish_prompt_pwd_dir_length 0
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
# https://learn.microsoft.com/en-us/windows/wsl/wsl-config
|
|
||||||
|
|
||||||
[boot]
|
|
||||||
systemd=false
|
|
||||||
|
|
||||||
[user]
|
|
||||||
default=lachtan
|
|
||||||
|
|
||||||
[automount]
|
|
||||||
enabled = true
|
|
||||||
|
|
||||||
[network]
|
|
||||||
generateHosts = true
|
|
||||||
generateResolvConf = false
|
|
||||||
|
|
||||||
[interop]
|
|
||||||
enabled = false
|
|
||||||
appendWindowsPath = false
|
|
||||||
|
|
||||||
[gpu]
|
|
||||||
enabled = true
|
|
||||||
3
fishrc
3
fishrc
@@ -1,3 +0,0 @@
|
|||||||
for file in (dirname (status -f))/rc.fish/*.fish
|
|
||||||
source $file
|
|
||||||
end
|
|
||||||
15
functions.sh
15
functions.sh
@@ -1,14 +1,9 @@
|
|||||||
# Linux Workspace Functions
|
# Linux Workspace Functions
|
||||||
# shellcheck shell=bash
|
|
||||||
|
|
||||||
if [ -z "$time_ms" ]; then
|
if [ -z "$time_ms" ]; then
|
||||||
readonly time_ms='date +%s%3N'
|
readonly time_ms='date +%s%3N'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
function is_interactive_shell() {
|
|
||||||
[[ $- == *i* ]]
|
|
||||||
}
|
|
||||||
|
|
||||||
function is_fast_init() {
|
function is_fast_init() {
|
||||||
(( $LWS_FAST ))
|
(( $LWS_FAST ))
|
||||||
}
|
}
|
||||||
@@ -18,7 +13,7 @@ function is_slow_init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function xlog() {
|
function xlog() {
|
||||||
if is_interactive_shell && true_false "$LWS_DEBUG"; then
|
if true_false "$LWS_DEBUG"; then
|
||||||
echo "$@"
|
echo "$@"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -104,11 +99,11 @@ function source_directory() {
|
|||||||
xlog "LOAD DIR $mask"
|
xlog "LOAD DIR $mask"
|
||||||
for file in $mask; do
|
for file in $mask; do
|
||||||
if [[ -e "$file" ]]; then
|
if [[ -e "$file" ]]; then
|
||||||
if is_interactive_shell && (( $LWS_DEBUG )); then
|
if (( $LWS_DEBUG )); then
|
||||||
start=$($time_ms)
|
start=$($time_ms)
|
||||||
source "$file"
|
source "$file"
|
||||||
stop=$($time_ms)
|
stop=$($time_ms)
|
||||||
xlog "LOAD FILE $file $((stop - start)) ms"
|
echo "LOAD FILE $file $((stop - start)) ms"
|
||||||
else
|
else
|
||||||
source "$file"
|
source "$file"
|
||||||
fi
|
fi
|
||||||
@@ -139,7 +134,3 @@ function true_false() {
|
|||||||
# [[ "${1,,}" =~ ^(1|true|yes)$ ]]
|
# [[ "${1,,}" =~ ^(1|true|yes)$ ]]
|
||||||
[[ "${1@L}" =~ ^(1|true|yes)$ ]]
|
[[ "${1@L}" =~ ^(1|true|yes)$ ]]
|
||||||
}
|
}
|
||||||
|
|
||||||
function is_wsl() {
|
|
||||||
grep -q -i wsl /proc/version
|
|
||||||
}
|
|
||||||
|
|||||||
32
install.sh
32
install.sh
@@ -2,29 +2,11 @@
|
|||||||
|
|
||||||
set -E -o errexit -o nounset -o pipefail
|
set -E -o errexit -o nounset -o pipefail
|
||||||
|
|
||||||
function install_lws() {
|
if grep -q -e 'source\s+.*/linux-workspace/bashrc\s*$' $HOME/.bashrc; then
|
||||||
local LWS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
|
echo "Linux Workspace configuration already exists in .bashrc !"
|
||||||
|
exit 1
|
||||||
if grep -q -e "source.*$LWS_DIR/bashrc" $HOME/.bashrc; then
|
else
|
||||||
echo "SKIP: Linux Workspace configuration already exists in $HOME/.bashrc !"
|
readonly SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd -P)
|
||||||
else
|
|
||||||
echo "Adding to $HOME/.bashrc"
|
echo "Adding to $HOME/.bashrc"
|
||||||
echo "source '$LWS_DIR/bashrc'" >> "$HOME/.bashrc"
|
echo "source '$SCRIPT_DIR/bashrc'" >> "$HOME/.bashrc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local FISH_CONF_DIR="$HOME/.config/fish"
|
|
||||||
local FISH_CONF_LWS="$FISH_CONF_DIR/conf.d/lws.fish"
|
|
||||||
|
|
||||||
if [[ -d "$FISH_CONF_DIR" ]]; then
|
|
||||||
if [[ -f "$FISH_CONF_LWS" ]]; then
|
|
||||||
echo "SKIP: Linux Workspace configuration already exists in $FISH_CONF_LWS !"
|
|
||||||
else
|
|
||||||
echo "Adding to $FISH_CONF_LWS"
|
|
||||||
echo "source $LWS_DIR/fishrc" > "$FISH_CONF_LWS"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Fish configuration directory not found, skipping fish setup."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
install_lws
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# https://code.claude.com/docs/en/setup
|
|
||||||
|
|
||||||
set -E -o errexit -o nounset -o pipefail
|
|
||||||
set -x
|
|
||||||
|
|
||||||
curl -fsSL https://claude.ai/install.sh | bash
|
|
||||||
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# https://github.com/google-gemini/gemini-cli
|
|
||||||
|
|
||||||
set -E -o errexit -o nounset -o pipefail
|
|
||||||
set -x
|
|
||||||
|
|
||||||
npm install -g @google/gemini-cli
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# https://github.com/nvm-sh/nvm
|
|
||||||
|
|
||||||
set -E -o errexit -o nounset -o pipefail
|
|
||||||
set -x
|
|
||||||
|
|
||||||
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
|
|
||||||
nvm install node
|
|
||||||
nvm use node
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
set -gx PAGER less
|
|
||||||
set -g fish_prompt_pwd_dir_length 0
|
|
||||||
|
|
||||||
# set -g fish_autosuggestion_enabled 0
|
|
||||||
# fish_config theme choose "fish default"
|
|
||||||
@@ -1,2 +1 @@
|
|||||||
prepend_path_try "$HOME/.local/bin"
|
prepend_path_try "$HOME/.local/bin"
|
||||||
prepend_path_try "$HOME/bin"
|
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
alias nop=':'
|
alias nop=':'
|
||||||
|
|
||||||
# Long format, human-readable, with indicators
|
|
||||||
alias ll='ls -lhF'
|
|
||||||
# Same as ll but including hidden files
|
|
||||||
alias la='ls -lhAF'
|
|
||||||
|
|
||||||
|
|
||||||
alias exit-when-error='set -o errexit'
|
alias exit-when-error='set -o errexit'
|
||||||
alias exit-when-unset-variable='set -o nounset'
|
alias exit-when-unset-variable='set -o nounset'
|
||||||
alias exit-when-pipe-fail='set -o pipefail'
|
alias exit-when-pipe-fail='set -o pipefail'
|
||||||
@@ -15,7 +9,6 @@ alias clws='cd $LWS'
|
|||||||
alias chs=cheatsheet
|
alias chs=cheatsheet
|
||||||
|
|
||||||
alias dc=docker-compose
|
alias dc=docker-compose
|
||||||
alias pc=podman-compose
|
|
||||||
alias dcl='dcm logs'
|
alias dcl='dcm logs'
|
||||||
alias dcfilter="sed -r 's/^[^|]+\| //g'"
|
alias dcfilter="sed -r 's/^[^|]+\| //g'"
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
# Terminal colors
|
|
||||||
LWS_RED=$(tput setaf 1)
|
|
||||||
LWS_GREEN=$(tput setaf 2)
|
|
||||||
LWS_CYAN=$(tput setaf 6)
|
|
||||||
LWS_COLOR_RESET=$(tput sgr0)
|
|
||||||
|
|
||||||
# Bash prompt escape sequences
|
|
||||||
LWS_PS1_USER='\u'
|
|
||||||
LWS_PS1_HOST='\h'
|
|
||||||
LWS_PS1_DIR='\w'
|
|
||||||
LWS_PS1_TYPE='\$'
|
|
||||||
LWS_PS1_USER_HOST="${LWS_GREEN}${LWS_PS1_USER}@${LWS_PS1_HOST}${LWS_COLOR_RESET}:${LWS_CYAN}${LWS_PS1_DIR}${LWS_COLOR_RESET}"
|
|
||||||
@@ -2,9 +2,19 @@
|
|||||||
# https://www.cyberciti.biz/faq/bash-shell-change-the-color-of-my-shell-prompt-under-linux-or-unix/
|
# https://www.cyberciti.biz/faq/bash-shell-change-the-color-of-my-shell-prompt-under-linux-or-unix/
|
||||||
# https://linux.101hacks.com/ps1-examples/prompt-color-using-tput/
|
# https://linux.101hacks.com/ps1-examples/prompt-color-using-tput/
|
||||||
|
|
||||||
|
RED=$(tput setaf 1)
|
||||||
|
GREEN=$(tput setaf 2)
|
||||||
|
CYAN=$(tput setaf 6)
|
||||||
|
COLOR_RESET=$(tput sgr0)
|
||||||
|
|
||||||
function get_ps1_prompt()
|
function get_ps1_prompt()
|
||||||
{
|
{
|
||||||
echo "${debian_chroot:+($debian_chroot)}${LWS_PS1_USER_HOST}${LWS_PS1_TYPE} "
|
local username='\u'
|
||||||
|
local hostname='\h'
|
||||||
|
local workdir='\w'
|
||||||
|
local user_type='\$'
|
||||||
|
|
||||||
|
echo "${debian_chroot:+($debian_chroot)}${GREEN}${username}@${hostname}${COLOR_RESET}:${CYAN}${workdir}${COLOR_RESET}${user_type} "
|
||||||
}
|
}
|
||||||
|
|
||||||
function set_ps1_prompt()
|
function set_ps1_prompt()
|
||||||
|
|||||||
@@ -1 +1,3 @@
|
|||||||
source_try "$HOME/.cargo/env"
|
if [[ -f "$HOME/.cargo/env" ]]; then
|
||||||
|
source "$HOME/.cargo/env"
|
||||||
|
fi
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
append_path_try "$HOME/.local/bin"
|
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
#COLORS_FILE="$LWS/conf/dircolors/ansi-light.dircolors"
|
#COLORS_FILE="$LWS/conf/dircolors/ansi-light.dircolors"
|
||||||
COLORS_FILE="$LWS/conf/dircolors/dracula.dircolors"
|
COLORS_FILE="$LWS/conf/dircolors/dracula.dircolors"
|
||||||
|
|
||||||
if can_run dircolors && [[ -f "$COLORS_FILE" ]]; then
|
if [[ -f "$COLORS_FILE" ]]; then
|
||||||
xlog "Loading colors $COLORS_FILE"
|
xlog "Loading colors $COLORS_FILE"
|
||||||
eval "$(dircolors "$COLORS_FILE")"
|
eval "$(dircolors "$COLORS_FILE")"
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
_INIT_FILE="$WORKSPACE/opt/enhancd/init.sh"
|
_INIT_FILE=$WORKSPACE/opt/enhancd/init.sh
|
||||||
|
|
||||||
if [[ -f $_INIT_FILE ]]; then
|
if [[ -f $_INIT_FILE ]]; then
|
||||||
source "$_INIT_FILE"
|
source $_INIT_FILE
|
||||||
unalias cd
|
unalias cd
|
||||||
alias ecd="__enhancd::cd"
|
alias ecd="__enhancd::cd"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -9,8 +9,5 @@ GIT_PROMPT_INIT="$GIT_PROMPT_PATH/gitprompt.sh"
|
|||||||
if [ -f "$GIT_PROMPT_INIT" ]; then
|
if [ -f "$GIT_PROMPT_INIT" ]; then
|
||||||
export GIT_PROMPT_PATH
|
export GIT_PROMPT_PATH
|
||||||
GIT_PROMPT_ONLY_IN_REPO=1
|
GIT_PROMPT_ONLY_IN_REPO=1
|
||||||
GIT_PROMPT_USER_HOST="${LWS_PS1_USER_HOST}"
|
|
||||||
GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${GIT_PROMPT_USER_HOST}"
|
|
||||||
GIT_PROMPT_START_ROOT="${GIT_PROMPT_START_USER}"
|
|
||||||
source "$GIT_PROMPT_INIT"
|
source "$GIT_PROMPT_INIT"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
|
||||||
CRYPTED_DIR="$HOME/Sync/safe"
|
CRYPTED_DIR=$HOME/Sync/safe
|
||||||
DECRYPTED_DIR="$HOME/mnt/safe"
|
DECRYPTED_DIR=$HOME/mnt/safe
|
||||||
|
|
||||||
function safe-mount() {
|
function safe-mount() {
|
||||||
gocryptfs "$CRYPTED_DIR" "$DECRYPTED_DIR"
|
gocryptfs $CRYPTED_DIR $DECRYPTED_DIR
|
||||||
}
|
}
|
||||||
|
|
||||||
function safe-unmount() {
|
function safe-unmount() {
|
||||||
fusermount -u "$DECRYPTED_DIR"
|
fusermount -u $DECRYPTED_DIR
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
NVM_DIR="$HOME/.nvm"
|
|
||||||
if [ -d "$NVM_DIR" ]; then
|
|
||||||
export NVM_DIR
|
|
||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
|
||||||
else
|
|
||||||
unset NVM_DIR
|
|
||||||
fi
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
append_path_try "$HOME/.opencode/bin"
|
|
||||||
@@ -1,51 +1,9 @@
|
|||||||
# Start ssh agent for private key
|
# Start ssh agent for private key
|
||||||
|
|
||||||
function _log() {
|
|
||||||
xlog "[ssh-agent] $*"
|
|
||||||
}
|
|
||||||
|
|
||||||
_SSH_AGENT_NO_KEYS=1
|
|
||||||
_SSH_AGENT_NOT_RUNNING=2
|
|
||||||
|
|
||||||
for key in id_ecdsa id_rsa; do
|
for key in id_ecdsa id_rsa; do
|
||||||
key_filename="$HOME/.ssh/$key"
|
key_filename="$HOME/.ssh/$key"
|
||||||
|
if [ -f $key_filename ]; then
|
||||||
if [ -f "$key_filename" ]; then
|
eval $(keychain --eval --quiet --agents ssh $key)
|
||||||
_log "SSH key: $key_filename"
|
|
||||||
|
|
||||||
if is_wsl; then
|
|
||||||
_log "WSL ON"
|
|
||||||
|
|
||||||
if [ -z "$SSH_AUTH_SOCK" ]; then
|
|
||||||
export SSH_AUTH_SOCK=$HOME/.ssh/ssh-agent.sock
|
|
||||||
fi
|
|
||||||
|
|
||||||
_log "SSH_AUTH_SOCK: $SSH_AUTH_SOCK"
|
|
||||||
|
|
||||||
ssh-add -L &> /dev/null
|
|
||||||
ssh_add_status=$?
|
|
||||||
|
|
||||||
if [[ -S "$SSH_AUTH_SOCK" && $ssh_add_status -eq $_SSH_AGENT_NOT_RUNNING ]]; then
|
|
||||||
_log "SSH agent does not running, delete $SSH_AUTH_SOCK"
|
|
||||||
rm -f "$SSH_AUTH_SOCK"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -S "$SSH_AUTH_SOCK" || $ssh_add_status -eq $_SSH_AGENT_NOT_RUNNING ]]; then
|
|
||||||
_log "Starting ssh-agent"
|
|
||||||
eval "$(ssh-agent -s -a "$SSH_AUTH_SOCK")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
ssh-add -L &> /dev/null
|
|
||||||
ssh_add_status=$?
|
|
||||||
|
|
||||||
if [[ $ssh_add_status -eq $_SSH_AGENT_NO_KEYS ]]; then
|
|
||||||
_log "Adding SSH key to agent"
|
|
||||||
ssh-add "$key_filename"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
eval "$(keychain --eval --quiet --agents ssh $key)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
"$WORKSPACE/scripts/changes.sh"
|
$WORKSPACE/scripts/changes.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user