Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b87b28213 | ||
|
|
1b22102296 |
@@ -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"
|
||||||
@@ -131,23 +108,5 @@ source $ZSH/oh-my-zsh.sh
|
|||||||
# 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
|
|
||||||
|
|
||||||
# Set GPG TTY
|
|
||||||
export GPG_TTY=$(tty)
|
|
||||||
# Refresh gpg-agent tty in case user switches into an X session
|
|
||||||
gpg-connect-agent updatestartuptty /bye >/dev/null
|
|
||||||
# Set SSH to use gpg-agent
|
|
||||||
unset SSH_AGENT_PID
|
|
||||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
|
||||||
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
|
||||||
fi
|
|
||||||
# Start the gpg-agent if not already running
|
|
||||||
if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
|
|
||||||
gpg-connect-agent /bye >/dev/null 2>&1
|
|
||||||
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
|
||||||
|
|||||||
@@ -1,34 +1,34 @@
|
|||||||
alefragnani.Bookmarks
|
alefragnani.Bookmarks
|
||||||
atlassian.atlascode
|
atlassian.atlascode
|
||||||
coolbear.systemd-unit-file
|
coolbear.systemd-unit-file
|
||||||
cschlosser.doxdocgen
|
cschlosser.doxdocgen
|
||||||
donjayamanne.githistory
|
donjayamanne.githistory
|
||||||
eamodio.gitlens
|
eamodio.gitlens
|
||||||
file-icons.file-icons
|
file-icons.file-icons
|
||||||
Gruntfuggly.todo-tree
|
Gruntfuggly.todo-tree
|
||||||
IBM.output-colorizer
|
IBM.output-colorizer
|
||||||
jeff-hykin.better-cpp-syntax
|
jeff-hykin.better-cpp-syntax
|
||||||
mhutchie.git-graph
|
mhutchie.git-graph
|
||||||
ms-azuretools.vscode-docker
|
ms-azuretools.vscode-docker
|
||||||
ms-python.isort
|
ms-python.isort
|
||||||
ms-python.pylint
|
ms-python.pylint
|
||||||
ms-python.python
|
ms-python.python
|
||||||
ms-python.vscode-pylance
|
ms-python.vscode-pylance
|
||||||
ms-vscode-remote.remote-containers
|
ms-vscode-remote.remote-containers
|
||||||
ms-vscode-remote.remote-ssh
|
ms-vscode-remote.remote-ssh
|
||||||
ms-vscode-remote.remote-ssh-edit
|
ms-vscode-remote.remote-ssh-edit
|
||||||
ms-vscode-remote.remote-wsl
|
ms-vscode-remote.remote-wsl
|
||||||
ms-vscode.cmake-tools
|
ms-vscode.cmake-tools
|
||||||
ms-vscode.cpptools
|
ms-vscode.cpptools
|
||||||
ms-vscode.cpptools-extension-pack
|
ms-vscode.cpptools-extension-pack
|
||||||
ms-vscode.cpptools-themes
|
ms-vscode.cpptools-themes
|
||||||
ms-vscode.makefile-tools
|
ms-vscode.makefile-tools
|
||||||
ms-vscode.remote-explorer
|
ms-vscode.remote-explorer
|
||||||
njpwerner.autodocstring
|
njpwerner.autodocstring
|
||||||
notskm.clang-tidy
|
notskm.clang-tidy
|
||||||
redhat.vscode-yaml
|
redhat.vscode-yaml
|
||||||
smcpeak.default-keys-windows
|
smcpeak.default-keys-windows
|
||||||
twxs.cmake
|
twxs.cmake
|
||||||
Tyriar.sort-lines
|
Tyriar.sort-lines
|
||||||
xaver.clang-format
|
xaver.clang-format
|
||||||
ZainChen.json
|
ZainChen.json
|
||||||
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
Reference in New Issue
Block a user