Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b87b28213 | ||
|
|
1b22102296 |
@@ -1,3 +1,10 @@
|
|||||||
|
alias duh1='du --max-depth=1 -h'
|
||||||
|
alias mv='mv -i'
|
||||||
|
alias rm='rm -i'
|
||||||
alias vi='vim'
|
alias vi='vim'
|
||||||
alias svi='sudo vi'
|
alias svi='sudo vi'
|
||||||
alias vims='vi -S'
|
alias vims='vi -S'
|
||||||
|
alias cdd='cd ..'
|
||||||
|
alias cddd='cd ../..'
|
||||||
|
alias cdddd='cd ../../..'
|
||||||
|
alias cddddd='cd ../../../..'
|
||||||
@@ -1,26 +1,3 @@
|
|||||||
# ssh key loading.
|
|
||||||
env=~/.ssh/agent.env
|
|
||||||
|
|
||||||
agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }
|
|
||||||
|
|
||||||
agent_start () {
|
|
||||||
(umask 077; ssh-agent >| "$env")
|
|
||||||
. "$env" >| /dev/null ; }
|
|
||||||
|
|
||||||
agent_load_env
|
|
||||||
|
|
||||||
# agent_run_state: 0=agent running w/ key; 1=agent w/o key; 2= agent not running
|
|
||||||
agent_run_state=$(ssh-add -l >| /dev/null 2>&1; echo $?)
|
|
||||||
|
|
||||||
if [ ! "$SSH_AUTH_SOCK" ] || [ $agent_run_state = 2 ]; then
|
|
||||||
agent_start
|
|
||||||
ssh-add
|
|
||||||
elif [ "$SSH_AUTH_SOCK" ] && [ $agent_run_state = 1 ]; then
|
|
||||||
ssh-add
|
|
||||||
fi
|
|
||||||
|
|
||||||
unset env
|
|
||||||
|
|
||||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||||
# Initialization code that may require console input (password prompts, [y/n]
|
# Initialization code that may require console input (password prompts, [y/n]
|
||||||
# confirmations, etc.) must go above this block; everything else may go below.
|
# confirmations, etc.) must go above this block; everything else may go below.
|
||||||
@@ -29,7 +6,7 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# If you come from bash you might have to change your $PATH.
|
# If you come from bash you might have to change your $PATH.
|
||||||
export PATH=$HOME/bin:/$HOME/.local/bin:$PATH
|
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
||||||
|
|
||||||
# Path to your oh-my-zsh installation.
|
# Path to your oh-my-zsh installation.
|
||||||
export ZSH="$HOME/.oh-my-zsh"
|
export ZSH="$HOME/.oh-my-zsh"
|
||||||
@@ -100,38 +77,10 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # set by `omz`
|
|||||||
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
|
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
# Add wisely, as too many plugins slow down shell startup.
|
# Add wisely, as too many plugins slow down shell startup.
|
||||||
plugins=(
|
plugins=(git docker node zsh-autosuggestions zsh-syntax-highlighting sudo gitfast history-substring-search docker-compose)
|
||||||
alias-finder
|
|
||||||
aliases
|
|
||||||
common-aliases
|
|
||||||
dircycle
|
|
||||||
docker
|
|
||||||
docker-compose
|
|
||||||
dotenv
|
|
||||||
git
|
|
||||||
gitfast
|
|
||||||
history-substring-search
|
|
||||||
jj
|
|
||||||
ng
|
|
||||||
node
|
|
||||||
npm
|
|
||||||
nvm
|
|
||||||
octozen
|
|
||||||
ssh
|
|
||||||
ssh-agent
|
|
||||||
sudo
|
|
||||||
uv
|
|
||||||
zsh-autosuggestions
|
|
||||||
zsh-syntax-highlighting
|
|
||||||
)
|
|
||||||
|
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
zstyle ':omz:plugins:alias-finder' autoload yes # disabled by default
|
|
||||||
zstyle ':omz:plugins:alias-finder' longer yes # disabled by default
|
|
||||||
zstyle ':omz:plugins:alias-finder' exact yes # disabled by default
|
|
||||||
zstyle ':omz:plugins:alias-finder' cheaper yes # disabled by default
|
|
||||||
|
|
||||||
# User configuration
|
# User configuration
|
||||||
|
|
||||||
# export MANPATH="/usr/local/man:$MANPATH"
|
# export MANPATH="/usr/local/man:$MANPATH"
|
||||||
@@ -159,18 +108,5 @@ zstyle ':omz:plugins:alias-finder' cheaper yes # disabled by default
|
|||||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||||
source $HOME/.aliases
|
source $HOME/.aliases
|
||||||
|
|
||||||
if [ -f $HOME/.exports ]; then
|
|
||||||
source $HOME/.exports
|
|
||||||
fi
|
|
||||||
|
|
||||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
|
|
||||||
# Set GPG TTY
|
|
||||||
export GPG_TTY=$TTY
|
|
||||||
|
|
||||||
|
|
||||||
. "$HOME/.local/bin/env"
|
|
||||||
|
|
||||||
autoload -U +X bashcompinit && bashcompinit
|
|
||||||
|
|
||||||
|
|||||||
Executable → Regular
+1
-1
@@ -5,4 +5,4 @@ git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$
|
|||||||
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
||||||
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
|
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
|
||||||
|
|
||||||
./setup_symlinks.sh
|
apt install stow
|
||||||
Executable → Regular
@@ -1,93 +0,0 @@
|
|||||||
{
|
|
||||||
"[python]": {
|
|
||||||
"editor.formatOnType": true,
|
|
||||||
"editor.codeActionsOnSave": {
|
|
||||||
"source.fixAll.ruff": "explicit",
|
|
||||||
"source.organizeImports.ruff": "explicit"
|
|
||||||
},
|
|
||||||
"editor.defaultFormatter": "charliermarsh.ruff",
|
|
||||||
"editor.formatOnPaste": true,
|
|
||||||
"editor.formatOnSave": true,
|
|
||||||
"editor.formatOnSaveMode": "file",
|
|
||||||
"editor.rulers": [127]
|
|
||||||
},
|
|
||||||
"workbench.iconTheme": "vscode-icons",
|
|
||||||
"git.confirmSync": false,
|
|
||||||
"git.autofetch": true,
|
|
||||||
"terminal.integrated.fontFamily": "MesloLGS NF",
|
|
||||||
"editor.formatOnSave": true,
|
|
||||||
"files.autoSave": "onWindowChange",
|
|
||||||
"eslint.format.enable": true,
|
|
||||||
"[typescript]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
|
||||||
},
|
|
||||||
"redhat.telemetry.enabled": false,
|
|
||||||
"vsicons.dontShowNewVersionMessage": true,
|
|
||||||
"typescript.updateImportsOnFileMove.enabled": "always",
|
|
||||||
"[html]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
|
||||||
},
|
|
||||||
"[yaml]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
|
||||||
"prettier.tabWidth": 2
|
|
||||||
},
|
|
||||||
"[json]": {
|
|
||||||
"editor.defaultFormatter": "vscode.json-language-features"
|
|
||||||
},
|
|
||||||
"[jsonc]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
|
||||||
},
|
|
||||||
"[css]": {
|
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
|
||||||
},
|
|
||||||
"prettier.bracketSameLine": true,
|
|
||||||
"formatFiles.runOrganizeImports": true,
|
|
||||||
"editor.codeActionsOnSave": {
|
|
||||||
"source.organizeImports": "explicit"
|
|
||||||
},
|
|
||||||
"java.configuration.runtimes": [],
|
|
||||||
"editor.formatOnSaveMode": "modificationsIfAvailable",
|
|
||||||
"editor.formatOnPaste": true,
|
|
||||||
"terminal.integrated.defaultProfile.windows": "Ubuntu-22.04 (WSL)",
|
|
||||||
"prettier.tabWidth": 4,
|
|
||||||
"notebook.formatOnSave.enabled": true,
|
|
||||||
"notebook.codeActionsOnSave": {
|
|
||||||
"source.fixAll.ruff": true,
|
|
||||||
"source.organizeImports.ruff": true
|
|
||||||
},
|
|
||||||
"python.analysis.autoImportCompletions": true,
|
|
||||||
"python.analysis.autoFormatStrings": true,
|
|
||||||
"python.analysis.completeFunctionParens": true,
|
|
||||||
"python.analysis.inlayHints.callArgumentNames": "all",
|
|
||||||
"python.analysis.inlayHints.functionReturnTypes": true,
|
|
||||||
"python.analysis.inlayHints.pytestParameters": true,
|
|
||||||
"python.analysis.inlayHints.variableTypes": true,
|
|
||||||
"python.analysis.typeCheckingMode": "basic",
|
|
||||||
"python.testing.pytestEnabled": true,
|
|
||||||
"gitlens.keymap": "none",
|
|
||||||
"remote.autoForwardPortsSource": "hybrid",
|
|
||||||
"window.zoomLevel": -1,
|
|
||||||
"files.insertFinalNewline": true,
|
|
||||||
"java.project.importOnFirstTimeStartup": "disabled",
|
|
||||||
"[markdown]": {
|
|
||||||
"editor.defaultFormatter": "DavidAnson.vscode-markdownlint",
|
|
||||||
"editor.rulers": [80],
|
|
||||||
"editor.formatOnSave": true,
|
|
||||||
"editor.formatOnPaste": true
|
|
||||||
},
|
|
||||||
"editor.rulers": [120],
|
|
||||||
"http.proxyStrictSSL": false,
|
|
||||||
"security.allowedUNCHosts": ["wsl.localhost"],
|
|
||||||
"[java]": {
|
|
||||||
"editor.defaultFormatter": "redhat.java"
|
|
||||||
},
|
|
||||||
"java.settings.url": "~/.vscode/settings.prefs",
|
|
||||||
"markdownlint.config": {
|
|
||||||
"MD013": true
|
|
||||||
},
|
|
||||||
"powershell.powerShellAdditionalExePaths": {
|
|
||||||
"powershell": "\"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe\""
|
|
||||||
},
|
|
||||||
"kotlin.languageServer.enabled": false,
|
|
||||||
"kotlin.debugAdapter.enabled": false
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user