Compare commits
3 Commits
main
...
copilot/ad
| Author | SHA1 | Date | |
|---|---|---|---|
|
435a01912b | ||
|
|
8978295fb1 | ||
|
|
5ad342ccb0 |
@@ -1,24 +0,0 @@
|
||||
filetype: sh
|
||||
detect:
|
||||
filename: "\\.sh$"
|
||||
header: "#!.*sh"
|
||||
rules:
|
||||
- comment: "(^|\\s)#.*$"
|
||||
- string:
|
||||
start: "\""
|
||||
end: "\""
|
||||
skip: "\\\\."
|
||||
rules:
|
||||
- escape: "\\\\(.|
|
||||
)"
|
||||
- placeholder: "%[-#0-9]*[.0-9]*[hlL]?[diouxXeEfFgGaAcspn%]"
|
||||
- string:
|
||||
start: "'"
|
||||
end: "'"
|
||||
skip: "\\\\."
|
||||
rules:
|
||||
- escape: "\\\\(.|
|
||||
)"
|
||||
- number: "\\b[0-9]+([.][0-9]*)?([eE][+-]?[0-9]+)?\\b"
|
||||
- symbol: "[\\$\\(\\)\\{\\}\\[\\];\\<>]"
|
||||
- keyword: "\\b(if|then|else|elif|fi|case|in|do|done|for|while|until|function|return)\\b"
|
||||
67
.github/workflows/bump-version.yml
vendored
67
.github/workflows/bump-version.yml
vendored
@@ -1,67 +0,0 @@
|
||||
name: Bump version.txt
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
# Avoid infinite loop when this workflow commits version.txt.
|
||||
paths-ignore:
|
||||
- "version.txt"
|
||||
|
||||
concurrency:
|
||||
group: bump-version-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
bump:
|
||||
if: github.actor != 'github-actions[bot]'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Bump patch version in version.txt
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
file="version.txt"
|
||||
if [[ ! -f "$file" ]]; then
|
||||
echo "0.0.1" > "$file"
|
||||
else
|
||||
v="$(tr -d '[:space:]' < "$file")"
|
||||
if [[ "$v" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
|
||||
major="${BASH_REMATCH[1]}"
|
||||
minor="${BASH_REMATCH[2]}"
|
||||
patch="${BASH_REMATCH[3]}"
|
||||
patch="$((patch + 1))"
|
||||
echo "${major}.${minor}.${patch}" > "$file"
|
||||
else
|
||||
echo "version.txt has invalid format: '$v' (expected x.y.z)" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "New version: $(cat "$file")"
|
||||
|
||||
- name: Commit and push
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
|
||||
# If version didn't change for any reason, do nothing.
|
||||
git add version.txt
|
||||
if git diff --cached --quiet; then
|
||||
echo "No changes to commit."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git commit -m "chore: bump version [skip ci]"
|
||||
git push
|
||||
|
||||
16
.microrc
16
.microrc
@@ -1,16 +0,0 @@
|
||||
# Micro editor configuration for syntax highlighting
|
||||
|
||||
# Colorscheme (optional)
|
||||
set colorscheme default
|
||||
|
||||
# Tab settings
|
||||
set tabsize 4
|
||||
set expandtab true
|
||||
|
||||
# Behavior
|
||||
set autoindent true
|
||||
set softwrap true
|
||||
set rmtrailingws true
|
||||
|
||||
# Enable syntax highlighting
|
||||
set syntaxhl true
|
||||
258
.zshrc
258
.zshrc
@@ -1,185 +1,179 @@
|
||||
# --- my-zsh loader + auto-updater (github.com/ushst/my-zsh) ---
|
||||
# This file is intended to stay small and stable.
|
||||
# Your personal config should go to ~/.zshrc.local or ~/.zshrc.d/*.zsh
|
||||
# --- zshrc auto-updater (github.com/ushst/my-zsh) ---
|
||||
typeset -gA UpdaterCfg
|
||||
UpdaterCfg[repoRawBase]="https://raw.githubusercontent.com/ushst/my-zsh/main"
|
||||
UpdaterCfg[remoteZshrcPath]=".zshrc"
|
||||
UpdaterCfg[remoteVersionPath]="version.txt"
|
||||
UpdaterCfg[checkIntervalSeconds]=21600 # 6 часов
|
||||
UpdaterCfg[offlineRetrySeconds]=300 # повторная попытка через 5 минут, если сети нет
|
||||
UpdaterCfg[networkCheckRetries]=3
|
||||
UpdaterCfg[networkRetryDelaySeconds]=1
|
||||
UpdaterCfg[networkCheckTimeoutSeconds]=2
|
||||
|
||||
typeset -gA MyZshUpdaterCfg
|
||||
MyZshUpdaterCfg[repoRawBase]="https://raw.githubusercontent.com/ushst/my-zsh/main"
|
||||
MyZshUpdaterCfg[remoteVersionPath]="version.txt"
|
||||
MyZshUpdaterCfg[remoteManagedPath]="zshrc.managed"
|
||||
MyZshUpdaterCfg[checkIntervalSeconds]=21600 # 6 hours
|
||||
MyZshUpdaterCfg[offlineRetrySeconds]=300 # retry in 5 minutes if offline
|
||||
MyZshUpdaterCfg[networkCheckRetries]=3
|
||||
MyZshUpdaterCfg[networkRetryDelaySeconds]=1
|
||||
MyZshUpdaterCfg[networkCheckTimeoutSeconds]=2
|
||||
localZshrc="${HOME}/.zshrc"
|
||||
localStateDir="${XDG_STATE_HOME:-${HOME}/.local/state}/zsh-updater"
|
||||
mkdir -p "${localStateDir}"
|
||||
|
||||
my_zsh_state_dir="${XDG_STATE_HOME:-${HOME}/.local/state}/my-zsh"
|
||||
my_zsh_config_dir="${XDG_CONFIG_HOME:-${HOME}/.config}/my-zsh"
|
||||
mkdir -p "${my_zsh_state_dir}" "${my_zsh_config_dir}" 2>/dev/null || true
|
||||
lastCheckFile="${localStateDir}/last_check"
|
||||
localVersionFile="${localStateDir}/local_version"
|
||||
lockFile="${localStateDir}/lock"
|
||||
deferredFlag="${localStateDir}/deferred_check_scheduled"
|
||||
|
||||
my_zsh_last_check_file="${my_zsh_state_dir}/last_check"
|
||||
my_zsh_local_version_file="${my_zsh_state_dir}/local_version"
|
||||
my_zsh_lock_dir="${my_zsh_state_dir}/lockdir"
|
||||
my_zsh_deferred_flag="${my_zsh_state_dir}/deferred_check_scheduled"
|
||||
|
||||
my_zsh_managed_file="${my_zsh_config_dir}/zshrc.managed"
|
||||
my_zsh_local_file="${HOME}/.zshrc.local"
|
||||
my_zsh_local_dir="${HOME}/.zshrc.d"
|
||||
|
||||
my_zsh_get_local_version() {
|
||||
[[ -f "${my_zsh_local_version_file}" ]] && cat "${my_zsh_local_version_file}" && return
|
||||
get_local_version() {
|
||||
[[ -f "${localVersionFile}" ]] && cat "${localVersionFile}" && return
|
||||
echo "0.0.0"
|
||||
}
|
||||
|
||||
my_zsh_version_lt() {
|
||||
[[ "$(printf '%s\n%s\n' "$1" "$2" | sort -V | head -n1)" == "$1" && "$1" != "$2" ]]
|
||||
}
|
||||
version_lt() { [[ "$(printf '%s\n%s\n' "$1" "$2" | sort -V | head -n1)" == "$1" && "$1" != "$2" ]]; }
|
||||
|
||||
my_zsh_should_check_now() {
|
||||
local now last
|
||||
should_check_now() {
|
||||
now=$(date +%s)
|
||||
[[ ! -f "${my_zsh_last_check_file}" ]] && return 0
|
||||
last=$(<"${my_zsh_last_check_file}")
|
||||
(( now - last >= MyZshUpdaterCfg[checkIntervalSeconds] ))
|
||||
[[ ! -f "${lastCheckFile}" ]] && return 0
|
||||
last=$(<"${lastCheckFile}")
|
||||
(( now - last >= UpdaterCfg[checkIntervalSeconds] ))
|
||||
}
|
||||
|
||||
my_zsh_with_lock() {
|
||||
# Portable lock (no flock dependency): mkdir is atomic on POSIX filesystems.
|
||||
if mkdir "${my_zsh_lock_dir}" 2>/dev/null; then
|
||||
"$@"
|
||||
rmdir "${my_zsh_lock_dir}" 2>/dev/null || true
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
with_lock() { exec 9>"${lockFile}"; flock -n 9 || return 1; "$@"; }
|
||||
|
||||
my_zsh_network_available() {
|
||||
local testUrl retries delay timeout attempt
|
||||
testUrl="${MyZshUpdaterCfg[repoRawBase]}/${MyZshUpdaterCfg[remoteVersionPath]}"
|
||||
retries=${MyZshUpdaterCfg[networkCheckRetries]}
|
||||
delay=${MyZshUpdaterCfg[networkRetryDelaySeconds]}
|
||||
timeout=${MyZshUpdaterCfg[networkCheckTimeoutSeconds]}
|
||||
update_local_version_cache() { echo "$1" > "${localVersionFile}"; }
|
||||
|
||||
network_available() {
|
||||
local testUrl="${UpdaterCfg[repoRawBase]}/${UpdaterCfg[remoteVersionPath]}"
|
||||
local retries=${UpdaterCfg[networkCheckRetries]}
|
||||
local delay=${UpdaterCfg[networkRetryDelaySeconds]}
|
||||
local timeout=${UpdaterCfg[networkCheckTimeoutSeconds]}
|
||||
|
||||
for (( attempt = 1; attempt <= retries; attempt++ )); do
|
||||
if command -v curl >/dev/null 2>&1; then
|
||||
if curl -fsI --max-time "${timeout}" "${testUrl}" >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
elif command -v wget >/dev/null 2>&1; then
|
||||
if wget -q --spider --timeout="${timeout}" "${testUrl}" >/dev/null 2>&1; then
|
||||
return 0
|
||||
fi
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
sleep "${delay}"
|
||||
done
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
my_zsh_update_local_version_cache() { echo "$1" > "${my_zsh_local_version_file}"; }
|
||||
schedule_offline_retry() {
|
||||
local delay="${UpdaterCfg[offlineRetrySeconds]}"
|
||||
[[ -f "${deferredFlag}" ]] && return 0
|
||||
|
||||
my_zsh_schedule_offline_retry() {
|
||||
local delay="${MyZshUpdaterCfg[offlineRetrySeconds]}"
|
||||
[[ -f "${my_zsh_deferred_flag}" ]] && return 0
|
||||
|
||||
echo "${delay}" > "${my_zsh_deferred_flag}"
|
||||
echo "${delay}" > "${deferredFlag}"
|
||||
(
|
||||
sleep "${delay}"
|
||||
rm -f "${my_zsh_deferred_flag}"
|
||||
my_zsh_update_check 1
|
||||
rm -f "${deferredFlag}"
|
||||
zshrc_update_check 1
|
||||
) >/dev/null 2>&1 &
|
||||
}
|
||||
|
||||
my_zsh_fetch_to() {
|
||||
local url out
|
||||
url="$1"
|
||||
out="$2"
|
||||
if command -v curl >/dev/null 2>&1; then
|
||||
curl -fsSL "${url}" -o "${out}"
|
||||
return $?
|
||||
zshrc_update_check() {
|
||||
local force="${1:-0}"
|
||||
|
||||
(( force )) || should_check_now || return 0
|
||||
|
||||
if ! network_available; then
|
||||
echo "$(date +%s)" > "${lastCheckFile}"
|
||||
[[ -t 1 ]] && echo "[zsh-updater] Сети нет. Повторим проверку позже."
|
||||
schedule_offline_retry
|
||||
return 0
|
||||
fi
|
||||
if command -v wget >/dev/null 2>&1; then
|
||||
wget -q -O "${out}" "${url}"
|
||||
return $?
|
||||
fi
|
||||
return 1
|
||||
|
||||
with_lock _do_update_check
|
||||
echo "$(date +%s)" > "${lastCheckFile}"
|
||||
}
|
||||
|
||||
my_zsh_do_update_check() {
|
||||
local repo remoteVersion localVersion tmpNew backup
|
||||
_do_update_check() {
|
||||
local repo="${UpdaterCfg[repoRawBase]}"
|
||||
local rverPath="${UpdaterCfg[remoteVersionPath]}"
|
||||
local rcfgPath="${UpdaterCfg[remoteZshrcPath]}"
|
||||
|
||||
repo="${MyZshUpdaterCfg[repoRawBase]}"
|
||||
remoteVersion="$( (command -v curl >/dev/null 2>&1 && curl -fsSL "${repo}/${MyZshUpdaterCfg[remoteVersionPath]}" 2>/dev/null) || (command -v wget >/dev/null 2>&1 && wget -q -O - "${repo}/${MyZshUpdaterCfg[remoteVersionPath]}" 2>/dev/null) || true )"
|
||||
remoteVersion="$(curl -fsSL "${repo}/${rverPath}" 2>/dev/null || true)"
|
||||
[[ -n "${remoteVersion}" ]] || return 0
|
||||
|
||||
localVersion="$(my_zsh_get_local_version)"
|
||||
localVersion="$(get_local_version)"
|
||||
|
||||
# If managed file doesn't exist yet, treat it like version 0.0.0.
|
||||
if [[ ! -f "${my_zsh_managed_file}" ]]; then
|
||||
localVersion="0.0.0"
|
||||
fi
|
||||
|
||||
if my_zsh_version_lt "${localVersion}" "${remoteVersion}"; then
|
||||
tmpNew="${my_zsh_state_dir}/zshrc.managed.new"
|
||||
backup="${my_zsh_state_dir}/managed.backup.$(date +%Y%m%d-%H%M%S)"
|
||||
if version_lt "${localVersion}" "${remoteVersion}"; then
|
||||
tmpNew="${localStateDir}/.zshrc.new"
|
||||
backup="${localStateDir}/zshrc.backup.$(date +%Y%m%d-%H%M%S)"
|
||||
|
||||
# простая «полоса проверки»
|
||||
if [[ -t 1 ]]; then
|
||||
echo -n "[my-zsh] Checking updates"
|
||||
echo -n "[zsh-updater] Проверка"
|
||||
for i in 1 2 3; do sleep 0.2; echo -n "."; done
|
||||
echo
|
||||
fi
|
||||
|
||||
if my_zsh_fetch_to "${repo}/${MyZshUpdaterCfg[remoteManagedPath]}" "${tmpNew}"; then
|
||||
cp -f "${my_zsh_managed_file}" "${backup}" 2>/dev/null || true
|
||||
mv -f "${tmpNew}" "${my_zsh_managed_file}"
|
||||
my_zsh_update_local_version_cache "${remoteVersion}"
|
||||
[[ -t 1 ]] && echo "[my-zsh] Updated managed config to ${remoteVersion}. Backup: ${backup}. Restart shell."
|
||||
if curl -fsSL "${repo}/${rcfgPath}" -o "${tmpNew}"; then
|
||||
cp -f "${localZshrc}" "${backup}" 2>/dev/null || true
|
||||
mv -f "${tmpNew}" "${localZshrc}"
|
||||
update_local_version_cache "${remoteVersion}"
|
||||
[[ -t 1 ]] && echo "[zsh-updater] Обновлено до ${remoteVersion}. Бэкап: ${backup}. Перезапусти shell."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
my_zsh_update_check() {
|
||||
local force="${1:-0}"
|
||||
zshrc_update_check
|
||||
# --- end zshrc auto-updater ---
|
||||
|
||||
# Allow disabling auto-update.
|
||||
[[ "${MY_ZSH_AUTOUPDATE:-1}" == "0" ]] && return 0
|
||||
# If you come from bash you might have to change your $PATH.
|
||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
|
||||
(( force )) || my_zsh_should_check_now || return 0
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
if ! my_zsh_network_available; then
|
||||
echo "$(date +%s)" > "${my_zsh_last_check_file}"
|
||||
[[ -t 1 ]] && echo "[my-zsh] Offline. Will retry later."
|
||||
my_zsh_schedule_offline_retry
|
||||
return 0
|
||||
# Theme
|
||||
ZSH_THEME="avit"
|
||||
|
||||
# Plugins
|
||||
plugins=(
|
||||
git
|
||||
zsh-autosuggestions
|
||||
zsh-syntax-highlighting
|
||||
)
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# User configuration
|
||||
prompt_context() {
|
||||
if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
|
||||
prompt_segment black default "%(!.%{%F{yellow}%}.)"
|
||||
fi
|
||||
|
||||
my_zsh_with_lock my_zsh_do_update_check || true
|
||||
echo "$(date +%s)" > "${my_zsh_last_check_file}"
|
||||
}
|
||||
|
||||
my_zsh_trigger_update_check() {
|
||||
# Run in background to avoid slowing shell startup.
|
||||
( my_zsh_update_check "$@" ) &!
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
||||
|
||||
# Custom aliases and functions
|
||||
alias untargz='tar -xvzf'
|
||||
|
||||
function a() {
|
||||
if [ "$1" = "i" ]; then
|
||||
shift
|
||||
sudo apt install "$@" && exec zsh
|
||||
elif [ "$1" = "u" ]; then
|
||||
sudo apt update
|
||||
elif [ "$1" = "up" ]; then
|
||||
sudo apt upgrade -y
|
||||
elif [ "$1" = "all" ]; then
|
||||
sudo apt update && sudo apt upgrade -y
|
||||
else
|
||||
echo "Неизвестная команда: a $1"
|
||||
fi
|
||||
}
|
||||
|
||||
# --- load managed config (auto-updated) ---
|
||||
if [[ -f "${my_zsh_managed_file}" ]]; then
|
||||
source "${my_zsh_managed_file}"
|
||||
fi
|
||||
|
||||
# --- load user overrides ---
|
||||
if [[ -f "${my_zsh_local_file}" ]]; then
|
||||
source "${my_zsh_local_file}"
|
||||
fi
|
||||
|
||||
if [[ -d "${my_zsh_local_dir}" ]]; then
|
||||
for f in "${my_zsh_local_dir}"/*.zsh(N); do
|
||||
source "$f"
|
||||
done
|
||||
fi
|
||||
|
||||
# Update last: takes effect next shell.
|
||||
my_zsh_trigger_update_check
|
||||
# --- end my-zsh loader + auto-updater ---
|
||||
|
||||
extract() {
|
||||
if [ -f "$1" ]; then
|
||||
case "$1" in
|
||||
*.tar.bz2) tar xvjf "$1" ;;
|
||||
*.tar.gz) tar xvzf "$1" ;;
|
||||
*.tar.xz) tar xvJf "$1" ;;
|
||||
*.tar) tar xvf "$1" ;;
|
||||
*.gz) gunzip "$1" ;;
|
||||
*.zip) unzip "$1" ;;
|
||||
*.rar) unrar x "$1" ;;
|
||||
*.7z) 7z x "$1" ;;
|
||||
*) echo "Неизвестный формат: $1" ;;
|
||||
esac
|
||||
else
|
||||
echo "Файл не найден: $1"
|
||||
fi
|
||||
}
|
||||
alias x='extract'
|
||||
|
||||
25
README.md
25
README.md
@@ -3,34 +3,9 @@
|
||||
|
||||
`bash -c "$(curl -fsSL https://raw.githubusercontent.com/ushst/my-zsh/main/termux_zsh.sh)"`
|
||||
|
||||
## Как теперь хранить свои изменения
|
||||
- `~/.zshrc` это загрузчик + автообновление managed-конфига.
|
||||
- Основная конфигурация обновляется в `~/.config/my-zsh/zshrc.managed`.
|
||||
- Твои личные настройки добавляй в `~/.zshrc.local` или в файлы `~/.zshrc.d/*.zsh` (они не будут перезаписываться).
|
||||
- Установщик ставит `~/.zshrc` один раз. Повторный запуск `install.sh`/`termux_zsh.sh` не перезапишет его, если там уже my-zsh loader.
|
||||
|
||||
## Отключить автообновление
|
||||
Добавь в `~/.zshrc.local`:
|
||||
`export MY_ZSH_AUTOUPDATE=0`
|
||||
|
||||
# MICRO
|
||||
Конфиг micro лежит в репо: `.microrc` и `.config/micro/syntax/shell.yaml`.
|
||||
|
||||
Установить вручную:
|
||||
`wget -O ~/.microrc https://raw.githubusercontent.com/ushst/my-zsh/main/.microrc`
|
||||
`mkdir -p ~/.config/micro/syntax && wget -O ~/.config/micro/syntax/shell.yaml https://raw.githubusercontent.com/ushst/my-zsh/main/.config/micro/syntax/shell.yaml`
|
||||
|
||||
Или через установщик: он спросит, ставить ли micro-конфиг.
|
||||
Можно без вопросов:
|
||||
`MY_ZSH_INSTALL_MICRO=1 bash -c "$(curl -fsSL https://raw.githubusercontent.com/ushst/my-zsh/main/install.sh)"`
|
||||
|
||||
|
||||
# NANO
|
||||
`sudo wget -O ~/.nanorc https://raw.githubusercontent.com/ushst/my-zsh/main/.nanorc`
|
||||
|
||||
# MSFCONSOLE
|
||||
`mkdir -p ~/.msf4 && wget -O ~/.msf4/msfconsole.rc https://raw.githubusercontent.com/ushst/my-zsh/main/msfconsole.rc`
|
||||
|
||||
Или через установщик: он спросит, ставить ли msfconsole-конфиг.
|
||||
Можно без вопросов:
|
||||
`MY_ZSH_INSTALL_MSFCONSOLE=1 bash -c "$(curl -fsSL https://raw.githubusercontent.com/ushst/my-zsh/main/install.sh)"`
|
||||
|
||||
365
index.hrml
365
index.hrml
@@ -1,365 +0,0 @@
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>my-zsh — быстрый старт</title>
|
||||
<style>
|
||||
:root {
|
||||
--bg: #0f141a;
|
||||
--panel: #161c23;
|
||||
--accent: #7bc9f3;
|
||||
--text: #d8e4ef;
|
||||
--muted: #8aa0b2;
|
||||
--success: #8de0a6;
|
||||
--warning: #f4c07a;
|
||||
}
|
||||
* { box-sizing: border-box; }
|
||||
body {
|
||||
margin: 0;
|
||||
background: radial-gradient(circle at 20% 20%, rgba(123,201,243,0.05), transparent 35%),
|
||||
radial-gradient(circle at 80% 10%, rgba(141,224,166,0.06), transparent 30%),
|
||||
var(--bg);
|
||||
color: var(--text);
|
||||
font-family: "JetBrains Mono", "Fira Code", Consolas, monospace;
|
||||
line-height: 1.6;
|
||||
min-height: 100vh;
|
||||
padding: 24px;
|
||||
}
|
||||
.wrapper {
|
||||
max-width: 1100px;
|
||||
margin: 0 auto 64px;
|
||||
background: linear-gradient(135deg, rgba(22,28,35,0.8), rgba(17,23,29,0.9));
|
||||
border: 1px solid rgba(123,201,243,0.1);
|
||||
border-radius: 16px;
|
||||
box-shadow: 0 25px 60px rgba(0,0,0,0.45);
|
||||
overflow: hidden;
|
||||
}
|
||||
header {
|
||||
padding: 28px 32px 12px;
|
||||
border-bottom: 1px solid rgba(123,201,243,0.1);
|
||||
}
|
||||
.title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
font-size: 22px;
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
.status {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 6px 10px;
|
||||
border-radius: 10px;
|
||||
background: rgba(141,224,166,0.1);
|
||||
border: 1px solid rgba(141,224,166,0.35);
|
||||
color: var(--success);
|
||||
font-size: 13px;
|
||||
}
|
||||
.tagline {
|
||||
margin: 6px 0 0;
|
||||
color: var(--muted);
|
||||
font-size: 14px;
|
||||
}
|
||||
.ascii {
|
||||
font-size: 11px;
|
||||
color: var(--accent);
|
||||
white-space: pre;
|
||||
background: rgba(0,0,0,0.25);
|
||||
padding: 16px;
|
||||
margin: 20px 0 0;
|
||||
border: 1px solid rgba(123,201,243,0.08);
|
||||
border-radius: 12px;
|
||||
overflow-x: auto;
|
||||
}
|
||||
.grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
|
||||
gap: 12px;
|
||||
margin-top: 16px;
|
||||
}
|
||||
.card {
|
||||
background: var(--panel);
|
||||
border: 1px solid rgba(123,201,243,0.08);
|
||||
border-radius: 12px;
|
||||
padding: 16px;
|
||||
}
|
||||
.card h3 {
|
||||
margin: 0 0 6px;
|
||||
font-size: 16px;
|
||||
color: var(--accent);
|
||||
letter-spacing: 0.4px;
|
||||
}
|
||||
.meta p {
|
||||
margin: 2px 0;
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
}
|
||||
.chapter {
|
||||
padding: 20px 32px 28px;
|
||||
border-top: 1px solid rgba(123,201,243,0.07);
|
||||
}
|
||||
.chapter h2 {
|
||||
margin: 0 0 4px;
|
||||
font-size: 18px;
|
||||
color: var(--accent);
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
.chapter small {
|
||||
color: var(--muted);
|
||||
}
|
||||
.info {
|
||||
margin: 14px 0;
|
||||
padding: 14px 16px;
|
||||
background: rgba(123,201,243,0.05);
|
||||
border: 1px dashed rgba(123,201,243,0.3);
|
||||
border-radius: 12px;
|
||||
color: var(--muted);
|
||||
font-size: 14px;
|
||||
}
|
||||
.steps {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
}
|
||||
.step {
|
||||
padding: 14px 16px;
|
||||
background: rgba(255,255,255,0.02);
|
||||
border: 1px solid rgba(123,201,243,0.08);
|
||||
border-radius: 12px;
|
||||
}
|
||||
.step strong { color: var(--success); }
|
||||
.command {
|
||||
margin-top: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
background: rgba(0,0,0,0.35);
|
||||
border: 1px solid rgba(123,201,243,0.15);
|
||||
border-radius: 10px;
|
||||
padding: 10px 12px;
|
||||
overflow-x: auto;
|
||||
}
|
||||
.command code {
|
||||
color: #fefefe;
|
||||
white-space: nowrap;
|
||||
font-size: 13px;
|
||||
}
|
||||
.copy-btn {
|
||||
margin-left: auto;
|
||||
padding: 8px 10px;
|
||||
background: rgba(123,201,243,0.15);
|
||||
border: 1px solid rgba(123,201,243,0.4);
|
||||
color: var(--accent);
|
||||
border-radius: 8px;
|
||||
cursor: pointer;
|
||||
transition: 0.15s ease;
|
||||
}
|
||||
.copy-btn:hover { background: rgba(123,201,243,0.25); }
|
||||
.copy-btn.copied {
|
||||
background: rgba(141,224,166,0.2);
|
||||
border-color: rgba(141,224,166,0.5);
|
||||
color: var(--success);
|
||||
}
|
||||
.notice {
|
||||
position: fixed;
|
||||
top: 18px;
|
||||
right: 18px;
|
||||
padding: 12px 16px;
|
||||
background: var(--panel);
|
||||
border: 1px solid rgba(141,224,166,0.4);
|
||||
border-radius: 10px;
|
||||
color: var(--success);
|
||||
opacity: 0;
|
||||
transform: translateY(-8px);
|
||||
transition: 0.2s ease;
|
||||
pointer-events: none;
|
||||
box-shadow: 0 10px 28px rgba(0,0,0,0.35);
|
||||
}
|
||||
.notice.show {
|
||||
opacity: 1;
|
||||
transform: translateY(0);
|
||||
}
|
||||
footer {
|
||||
padding: 18px 32px 24px;
|
||||
border-top: 1px solid rgba(123,201,243,0.07);
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
}
|
||||
a { color: var(--accent); text-decoration: none; }
|
||||
@media (max-width: 640px) {
|
||||
body { padding: 16px; }
|
||||
header, .chapter, footer { padding: 18px; }
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrapper">
|
||||
<header>
|
||||
<div class="title">
|
||||
<span>┌─[ ushst/my-zsh ]</span>
|
||||
<span class="status">● Сборка готова</span>
|
||||
</div>
|
||||
<p class="tagline">Готовые конфигурации ZSH и Nano. Делайте развёртывание в один шаг на Linux или Termux.</p>
|
||||
<div class="ascii" aria-hidden="true">
|
||||
███████╗███████╗██╗ ██╗ ███████╗███████╗████████╗██╗ ██╗██████╗
|
||||
╚══███╔╝██╔════╝██║ ██║ ██╔════╝██╔════╝╚══██╔══╝██║ ██║██╔══██╗
|
||||
███╔╝ ███████╗███████║ ███████╗█████╗ ██║ ██║ ██║██████╔╝
|
||||
███╔╝ ╚════██║██╔══██║ ╚════██║██╔══╝ ██║ ██║ ██║██╔═══╝
|
||||
███████╗███████║██║ ██║ ███████║███████╗ ██║ ╚██████╔╝██║
|
||||
╚══════╝╚══════╝╚═╝ ╚═╝ ╚══════╝╚══════╝ ╚═╝ ╚═════╝ ╚═╝
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="card">
|
||||
<h3>GitHub</h3>
|
||||
<div class="meta">
|
||||
<p><strong>Repo:</strong> <a href="https://github.com/ushst/my-zsh" target="_blank" rel="noreferrer">ushst/my-zsh</a></p>
|
||||
<p><strong>Stars:</strong> 0 • <strong>Watchers:</strong> 1 • <strong>Forks:</strong> 0</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<h3>Содержимое</h3>
|
||||
<div class="meta">
|
||||
<p>• Полный zsh конфиг (.zshrc)</p>
|
||||
<p>• Установка плагинов autosuggestions + syntax-highlighting</p>
|
||||
<p>• Готовый .nanorc и msfconsole.rc</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<section class="chapter" id="linux-zsh">
|
||||
<h2>[ ZSH для Linux ]</h2>
|
||||
<small>Скрипт install.sh ставит Oh-My-Zsh, плагины и конфигурацию.</small>
|
||||
<div class="info">Требуется sudo. По завершении смените оболочку на zsh и перезапустите терминал.</div>
|
||||
<ol class="steps">
|
||||
<li class="step"><strong>Шаг 1.</strong> Обновите зависимости
|
||||
<div class="command" data-command="sudo apt install zsh curl wget git -y">
|
||||
<code>$ sudo apt install zsh curl wget git -y</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
<li class="step"><strong>Шаг 2.</strong> Запустите установку конфигурации
|
||||
<div class="command" data-command='bash -c "$(curl -fsSL https://raw.githubusercontent.com/ushst/my-zsh/main/install.sh)"'>
|
||||
<code>bash -c "$(curl -fsSL https://raw.githubusercontent.com/ushst/my-zsh/main/install.sh)"</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
<li class="step"><strong>Шаг 3.</strong> Сделайте zsh оболочкой по умолчанию
|
||||
<div class="command" data-command="chsh -s $(which zsh)">
|
||||
<code>chsh -s $(which zsh)</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
<li class="step"><strong>Шаг 4.</strong> Перезапустите сессию
|
||||
<div class="command" data-command="exec zsh">
|
||||
<code>exec zsh</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</section>
|
||||
|
||||
<section class="chapter" id="termux-zsh">
|
||||
<h2>[ ZSH для Termux ]</h2>
|
||||
<small>Скрипт termux_zsh.sh адаптирует .zshrc под Termux и ставит плагины.</small>
|
||||
<div class="info">Используется пакетный менеджер pkg. sudo не нужен.</div>
|
||||
<ol class="steps">
|
||||
<li class="step"><strong>Шаг 1.</strong> Установите зависимости
|
||||
<div class="command" data-command="pkg install zsh curl wget git -y">
|
||||
<code>pkg install zsh curl wget git -y</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
<li class="step"><strong>Шаг 2.</strong> Выполните установщик конфигурации
|
||||
<div class="command" data-command='bash -c "$(curl -fsSL https://raw.githubusercontent.com/ushst/my-zsh/main/termux_zsh.sh)"'>
|
||||
<code>bash -c "$(curl -fsSL https://raw.githubusercontent.com/ushst/my-zsh/main/termux_zsh.sh)"</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
<li class="step"><strong>Шаг 3.</strong> Сделайте zsh основным и перезапустите
|
||||
<div class="command" data-command="chsh -s $(which zsh) && exec zsh">
|
||||
<code>$ chsh -s $(which zsh) && exec zsh</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</section>
|
||||
|
||||
<section class="chapter" id="nano">
|
||||
<h2>[ Конфигурация Nano ]</h2>
|
||||
<small>.nanorc с подсветкой и полезными настройками.</small>
|
||||
<div class="info">Можно ставить отдельно от ZSH. Команда перезапишет ~/.nanorc.</div>
|
||||
<div class="step">
|
||||
<strong>Установка:</strong>
|
||||
<div class="command" data-command="sudo wget -O ~/.nanorc https://raw.githubusercontent.com/ushst/my-zsh/main/.nanorc">
|
||||
<code>$ sudo wget -O ~/.nanorc https://raw.githubusercontent.com/ushst/my-zsh/main/.nanorc</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="chapter" id="msfconsole">
|
||||
<h2>[ Настройка msfconsole ]</h2>
|
||||
<small>Дополнительный aliases для Metasploit Framework.</small>
|
||||
<div class="info">Создаёт ~/.msf4/msfconsole.rc и добавляет alias s → search.</div>
|
||||
<ol class="steps">
|
||||
<li class="step"><strong>Шаг 1.</strong> Подготовьте директорию
|
||||
<div class="command" data-command="mkdir -p ~/.msf4">
|
||||
<code>$ mkdir -p ~/.msf4</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
<li class="step"><strong>Шаг 2.</strong> Скачайте конфиг
|
||||
<div class="command" data-command="wget -O ~/.msf4/msfconsole.rc https://raw.githubusercontent.com/ushst/my-zsh/main/msfconsole.rc">
|
||||
<code>$ wget -O ~/.msf4/msfconsole.rc https://raw.githubusercontent.com/ushst/my-zsh/main/msfconsole.rc</code>
|
||||
<button class="copy-btn" onclick="copyCommand(this)">Copy</button>
|
||||
</div>
|
||||
</li>
|
||||
</ol>
|
||||
</section>
|
||||
|
||||
<footer>
|
||||
<span>[ System Ready _ ]</span>
|
||||
<span>© 2025 ushst/my-zsh • Terminal Interface v1.1</span>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<div id="notification" class="notice">Команда скопирована</div>
|
||||
|
||||
<script>
|
||||
function copyCommand(button) {
|
||||
const commandBlock = button.closest('.command');
|
||||
const command = commandBlock.getAttribute('data-command');
|
||||
|
||||
navigator.clipboard.writeText(command).then(() => {
|
||||
const notification = document.getElementById('notification');
|
||||
notification.classList.add('show');
|
||||
const original = button.textContent;
|
||||
button.textContent = '✓';
|
||||
button.classList.add('copied');
|
||||
setTimeout(() => {
|
||||
notification.classList.remove('show');
|
||||
button.textContent = original;
|
||||
button.classList.remove('copied');
|
||||
}, 1800);
|
||||
}).catch((err) => {
|
||||
console.error('Ошибка при копировании: ', err);
|
||||
alert('Не удалось скопировать команду');
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
console.log('%c my-zsh landing loaded ', 'background: #0f141a; color: #7bc9f3; font-family: monospace; padding: 4px;');
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
84
install.sh
84
install.sh
@@ -5,13 +5,12 @@ set -e
|
||||
ZSH_DIR="${HOME}/.oh-my-zsh"
|
||||
ZDOTDIR="${HOME}"
|
||||
ZSHRC_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/.zshrc"
|
||||
ZSHRC_MANAGED_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/zshrc.managed"
|
||||
PLUGINS_REPO1="https://github.com/zsh-users/zsh-autosuggestions"
|
||||
PLUGINS_REPO2="https://github.com/zsh-users/zsh-syntax-highlighting.git"
|
||||
# =============================
|
||||
|
||||
echo "[*] Установка зависимостей..."
|
||||
sudo apt install -y git zsh curl wget
|
||||
sudo apt install -y git zsh curl wget which
|
||||
|
||||
echo "[*] Установка Oh-My-Zsh..."
|
||||
# Скачаем и запускаем установщик oh-my-zsh в режиме unattended
|
||||
@@ -24,84 +23,11 @@ echo "[*] Установка плагинов..."
|
||||
git clone "$PLUGINS_REPO1" ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions || true
|
||||
git clone "$PLUGINS_REPO2" ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting || true
|
||||
|
||||
echo "[*] Установка загрузчика .zshrc (my-zsh)..."
|
||||
# Ставим loader один раз: если он уже установлен, не перезаписываем ~/.zshrc.
|
||||
if [ -f "${ZDOTDIR}/.zshrc" ] && grep -q "my-zsh loader + auto-updater" "${ZDOTDIR}/.zshrc" 2>/dev/null; then
|
||||
echo "[*] ~/.zshrc уже установлен как my-zsh loader — пропускаю."
|
||||
else
|
||||
# Не теряем существующий ~/.zshrc: делаем бэкап, если он есть.
|
||||
if [ -f "${ZDOTDIR}/.zshrc" ]; then
|
||||
cp -f "${ZDOTDIR}/.zshrc" "${ZDOTDIR}/.zshrc.backup.$(date +%Y%m%d-%H%M%S)" || true
|
||||
fi
|
||||
wget -O "${ZDOTDIR}/.zshrc" "$ZSHRC_URL"
|
||||
fi
|
||||
|
||||
echo "[*] Загрузка managed-конфига (auto-updated)..."
|
||||
mkdir -p "${HOME}/.config/my-zsh" || true
|
||||
wget -O "${HOME}/.config/my-zsh/zshrc.managed" "$ZSHRC_MANAGED_URL"
|
||||
|
||||
echo "[*] Создаю файл для пользовательских правок: ~/.zshrc.local (если его нет)..."
|
||||
if [ ! -f "${HOME}/.zshrc.local" ]; then
|
||||
cat > "${HOME}/.zshrc.local" <<'EOF'
|
||||
# Your custom zsh config goes here.
|
||||
# This file will NOT be overwritten by my-zsh updates.
|
||||
EOF
|
||||
fi
|
||||
|
||||
# ========= Optional configs =========
|
||||
ask_yes_no() {
|
||||
# Usage: ask_yes_no "Question" "N|Y"
|
||||
local question default reply
|
||||
question="$1"
|
||||
default="${2:-N}"
|
||||
|
||||
# Non-interactive shell: honor default.
|
||||
if [ ! -t 0 ]; then
|
||||
[ "${default}" = "Y" ] && return 0 || return 1
|
||||
fi
|
||||
|
||||
read -r -p "${question} [y/N]: " reply
|
||||
reply="${reply:-$default}"
|
||||
case "$reply" in
|
||||
y|Y|yes|YES) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
backup_if_exists() {
|
||||
local p ts
|
||||
p="$1"
|
||||
ts="$(date +%Y%m%d-%H%M%S)"
|
||||
if [ -f "$p" ]; then
|
||||
cp -f "$p" "$p.backup.$ts" 2>/dev/null || true
|
||||
fi
|
||||
}
|
||||
|
||||
# Micro
|
||||
MICRORC_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/.microrc"
|
||||
MICRO_SHELL_SYNTAX_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/.config/micro/syntax/shell.yaml"
|
||||
|
||||
if [ "${MY_ZSH_INSTALL_MICRO:-}" = "1" ] || ( [ "${MY_ZSH_INSTALL_MICRO:-}" != "0" ] && ask_yes_no "[?] Установить конфиг для micro ( .microrc + syntax )?" "N" ); then
|
||||
echo "[*] Установка конфига micro..."
|
||||
backup_if_exists "${HOME}/.microrc"
|
||||
wget -O "${HOME}/.microrc" "$MICRORC_URL"
|
||||
mkdir -p "${HOME}/.config/micro/syntax" || true
|
||||
backup_if_exists "${HOME}/.config/micro/syntax/shell.yaml"
|
||||
wget -O "${HOME}/.config/micro/syntax/shell.yaml" "$MICRO_SHELL_SYNTAX_URL"
|
||||
fi
|
||||
|
||||
# msfconsole
|
||||
MSFCONSOLE_RC_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/msfconsole.rc"
|
||||
|
||||
if [ "${MY_ZSH_INSTALL_MSFCONSOLE:-}" = "1" ] || ( [ "${MY_ZSH_INSTALL_MSFCONSOLE:-}" != "0" ] && ask_yes_no "[?] Установить конфиг для msfconsole ( alias s -> search )?" "N" ); then
|
||||
echo "[*] Установка конфига msfconsole..."
|
||||
mkdir -p "${HOME}/.msf4" || true
|
||||
backup_if_exists "${HOME}/.msf4/msfconsole.rc"
|
||||
wget -O "${HOME}/.msf4/msfconsole.rc" "$MSFCONSOLE_RC_URL"
|
||||
fi
|
||||
echo "[*] Загрузка конфигурации .zshrc..."
|
||||
wget -O "${ZDOTDIR}/.zshrc" "$ZSHRC_URL"
|
||||
|
||||
echo "[*] Смена стандартной оболочки на zsh..."
|
||||
chsh -s "$(which zsh)" "$USER"
|
||||
|
||||
echo "[*] Установка завершена! Запускаю новую сессию zsh..."
|
||||
exec zsh
|
||||
echo "[*] Установка завершена! Чтобы применить изменения выполните:"
|
||||
echo " exec zsh"
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
load alias
|
||||
alias s search
|
||||
alias so show options
|
||||
|
||||
@@ -5,7 +5,6 @@ set -e
|
||||
ZSH_DIR="${HOME}/.oh-my-zsh"
|
||||
ZDOTDIR="${HOME}"
|
||||
ZSHRC_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/.zshrc"
|
||||
ZSHRC_MANAGED_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/zshrc.managed"
|
||||
PLUGINS_REPO1="https://github.com/zsh-users/zsh-autosuggestions"
|
||||
PLUGINS_REPO2="https://github.com/zsh-users/zsh-syntax-highlighting.git"
|
||||
# =============================
|
||||
@@ -24,97 +23,24 @@ echo "[*] Установка плагинов..."
|
||||
git clone "$PLUGINS_REPO1" ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions || true
|
||||
git clone "$PLUGINS_REPO2" ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting || true
|
||||
|
||||
echo "[*] Установка загрузчика .zshrc (my-zsh)..."
|
||||
# Ставим loader один раз: если он уже установлен, не перезаписываем ~/.zshrc.
|
||||
if [ -f "${ZDOTDIR}/.zshrc" ] && grep -q "my-zsh loader + auto-updater" "${ZDOTDIR}/.zshrc" 2>/dev/null; then
|
||||
echo "[*] ~/.zshrc уже установлен как my-zsh loader — пропускаю."
|
||||
else
|
||||
# Не теряем существующий ~/.zshrc: делаем бэкап, если он есть.
|
||||
if [ -f "${ZDOTDIR}/.zshrc" ]; then
|
||||
cp -f "${ZDOTDIR}/.zshrc" "${ZDOTDIR}/.zshrc.backup.$(date +%Y%m%d-%H%M%S)" || true
|
||||
fi
|
||||
wget -O "${ZDOTDIR}/.zshrc" "$ZSHRC_URL"
|
||||
fi
|
||||
echo "[*] Загрузка конфигурации .zshrc..."
|
||||
wget -O "${ZDOTDIR}/.zshrc" "$ZSHRC_URL"
|
||||
|
||||
echo "[*] Загрузка managed-конфига (auto-updated)..."
|
||||
mkdir -p "${HOME}/.config/my-zsh" || true
|
||||
wget -O "${HOME}/.config/my-zsh/zshrc.managed" "$ZSHRC_MANAGED_URL"
|
||||
|
||||
# Если установка проходит в Termux — заменим "sudo apt install" на "apt install" в managed-конфиге
|
||||
# Если установка проходит в Termux — заменим "sudo apt install" на "apt install" в .zshrc
|
||||
if [ -n "$TERMUX_VERSION" ] || ( [ -n "$PREFIX" ] && [[ "$PREFIX" == *"com.termux"* ]] ); then
|
||||
echo "[*] Обнаружен Termux — адаптирую managed-конфиг (замена 'sudo apt install' -> 'apt install')..."
|
||||
if grep -q "sudo apt install" "${HOME}/.config/my-zsh/zshrc.managed" 2>/dev/null; then
|
||||
echo "[*] Обнаружен Termux — адаптирую .zshrc (замена 'sudo apt install' -> 'apt install')..."
|
||||
if grep -q "sudo apt install" "${ZDOTDIR}/.zshrc" 2>/dev/null; then
|
||||
# делаем inplace замену и удаляем бэкап, если он создастся
|
||||
sed -i.bak 's/sudo apt install/apt install/g' "${HOME}/.config/my-zsh/zshrc.managed" || true
|
||||
rm -f "${HOME}/.config/my-zsh/zshrc.managed.bak" || true
|
||||
sed -i.bak 's/sudo apt install/apt install/g' "${ZDOTDIR}/.zshrc" || true
|
||||
rm -f "${ZDOTDIR}/.zshrc.bak" || true
|
||||
echo "[*] Замена выполнена."
|
||||
else
|
||||
echo "[*] В managed-конфиге не найдено 'sudo apt install' — ничего менять не нужно."
|
||||
echo "[*] В .zshrc не найдено 'sudo apt install' — ничего менять не нужно."
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "[*] Создаю файл для пользовательских правок: ~/.zshrc.local (если его нет)..."
|
||||
if [ ! -f "${HOME}/.zshrc.local" ]; then
|
||||
cat > "${HOME}/.zshrc.local" <<'EOF'
|
||||
# Your custom zsh config goes here.
|
||||
# This file will NOT be overwritten by my-zsh updates.
|
||||
EOF
|
||||
fi
|
||||
|
||||
# ========= Optional configs =========
|
||||
ask_yes_no() {
|
||||
# Usage: ask_yes_no "Question" "N|Y"
|
||||
local question default reply
|
||||
question="$1"
|
||||
default="${2:-N}"
|
||||
|
||||
# Non-interactive shell: honor default.
|
||||
if [ ! -t 0 ]; then
|
||||
[ "${default}" = "Y" ] && return 0 || return 1
|
||||
fi
|
||||
|
||||
read -r -p "${question} [y/N]: " reply
|
||||
reply="${reply:-$default}"
|
||||
case "$reply" in
|
||||
y|Y|yes|YES) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
backup_if_exists() {
|
||||
local p ts
|
||||
p="$1"
|
||||
ts="$(date +%Y%m%d-%H%M%S)"
|
||||
if [ -f "$p" ]; then
|
||||
cp -f "$p" "$p.backup.$ts" 2>/dev/null || true
|
||||
fi
|
||||
}
|
||||
|
||||
# Micro
|
||||
MICRORC_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/.microrc"
|
||||
MICRO_SHELL_SYNTAX_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/.config/micro/syntax/shell.yaml"
|
||||
|
||||
if [ "${MY_ZSH_INSTALL_MICRO:-}" = "1" ] || ( [ "${MY_ZSH_INSTALL_MICRO:-}" != "0" ] && ask_yes_no "[?] Установить конфиг для micro ( .microrc + syntax )?" "N" ); then
|
||||
echo "[*] Установка конфига micro..."
|
||||
backup_if_exists "${HOME}/.microrc"
|
||||
wget -O "${HOME}/.microrc" "$MICRORC_URL"
|
||||
mkdir -p "${HOME}/.config/micro/syntax" || true
|
||||
backup_if_exists "${HOME}/.config/micro/syntax/shell.yaml"
|
||||
wget -O "${HOME}/.config/micro/syntax/shell.yaml" "$MICRO_SHELL_SYNTAX_URL"
|
||||
fi
|
||||
|
||||
# msfconsole
|
||||
MSFCONSOLE_RC_URL="https://raw.githubusercontent.com/ushst/my-zsh/main/msfconsole.rc"
|
||||
|
||||
if [ "${MY_ZSH_INSTALL_MSFCONSOLE:-}" = "1" ] || ( [ "${MY_ZSH_INSTALL_MSFCONSOLE:-}" != "0" ] && ask_yes_no "[?] Установить конфиг для msfconsole ( alias s -> search )?" "N" ); then
|
||||
echo "[*] Установка конфига msfconsole..."
|
||||
mkdir -p "${HOME}/.msf4" || true
|
||||
backup_if_exists "${HOME}/.msf4/msfconsole.rc"
|
||||
wget -O "${HOME}/.msf4/msfconsole.rc" "$MSFCONSOLE_RC_URL"
|
||||
fi
|
||||
|
||||
echo "[*] Смена стандартной оболочки на zsh..."
|
||||
chsh -s "$(which zsh)" "$USER"
|
||||
|
||||
echo "[*] Установка завершена! Запускаю новую сессию zsh..."
|
||||
exec zsh
|
||||
echo "[*] Установка завершена! Чтобы применить изменения выполните:"
|
||||
echo " exec zsh"
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.3.1
|
||||
1.1.0
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
# Managed by github.com/ushst/my-zsh (do not edit; it may be overwritten).
|
||||
# Put your changes into ~/.zshrc.local or ~/.zshrc.d/*.zsh
|
||||
|
||||
# If you come from bash you might have to change your $PATH.
|
||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
# Theme
|
||||
ZSH_THEME="avit"
|
||||
|
||||
# Plugins
|
||||
plugins=(
|
||||
git
|
||||
zsh-autosuggestions
|
||||
zsh-syntax-highlighting
|
||||
)
|
||||
|
||||
source "$ZSH/oh-my-zsh.sh"
|
||||
|
||||
# User configuration
|
||||
prompt_context() {
|
||||
if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
|
||||
prompt_segment black default "%(!.%{%F{yellow}%}.)"
|
||||
fi
|
||||
}
|
||||
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
||||
|
||||
# Custom aliases and functions
|
||||
alias untargz='tar -xvzf'
|
||||
|
||||
function a() {
|
||||
case "$1" in
|
||||
i)
|
||||
shift
|
||||
sudo apt install "$@"
|
||||
;;
|
||||
u)
|
||||
sudo apt update
|
||||
;;
|
||||
up)
|
||||
sudo apt upgrade -y
|
||||
;;
|
||||
all)
|
||||
sudo apt update && sudo apt upgrade -y
|
||||
;;
|
||||
*)
|
||||
echo "Неизвестная команда: a $1"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
extract() {
|
||||
if [ -f "$1" ]; then
|
||||
case "$1" in
|
||||
*.tar.bz2) tar xvjf "$1" ;;
|
||||
*.tar.gz) tar xvzf "$1" ;;
|
||||
*.tar.xz) tar xvJf "$1" ;;
|
||||
*.tar) tar xvf "$1" ;;
|
||||
*.gz) gunzip "$1" ;;
|
||||
*.zip) unzip "$1" ;;
|
||||
*.rar) unrar x "$1" ;;
|
||||
*.7z) 7z x "$1" ;;
|
||||
*) echo "Неизвестный формат: $1" ;;
|
||||
esac
|
||||
else
|
||||
echo "Файл не найден: $1"
|
||||
fi
|
||||
}
|
||||
|
||||
alias x='extract'
|
||||
|
||||
Reference in New Issue
Block a user