merge: main

This commit is contained in:
aduhayon 2022-08-10 09:45:43 +02:00
commit 4c61464338
2 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.config/zsh/.zshrc. # Enable Powerlevel10k instant prompt. Should stay close to the top of "$ZDOTDIR"/.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.
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
@ -76,7 +76,7 @@ CASE_SENSITIVE="true"
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
plugins=(git vi-mode) plugins=(git vi-mode)
. $ZSH/oh-my-zsh.sh . "$ZSH"/oh-my-zsh.sh
# User configuration # User configuration
@ -95,8 +95,8 @@ plugins=(git vi-mode)
# Compilation flags # Compilation flags
# export ARCHFLAGS="-arch x86_64" # export ARCHFLAGS="-arch x86_64"
# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh. # To customize prompt, run `p10k configure` or edit "$ZDOTDIR"/.p10k.zsh.
[[ ! -f "$ZDOTDIR/.p10k.zsh" ]] || . "$ZDOTDIR/.p10k.zsh" [[ ! -f "$ZDOTDIR"/.p10k.zsh ]] || . "$ZDOTDIR"/.p10k.zsh
eval "$(pyenv init -)" eval "$(pyenv init -)"
. "$ZDOTDIR"/.zsh_aliases . "$ZDOTDIR"/.zsh_aliases

2
.gitmodules vendored
View File

@ -9,7 +9,7 @@
url = https://github.com/neovim/nvim-lspconfig url = https://github.com/neovim/nvim-lspconfig
[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"] [submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"]
path = .config/nvim/pack/plugins/opt/nvim-treesitter path = .config/nvim/pack/plugins/opt/nvim-treesitter
url = https://github.com/nvim-treesitter/nvim-treesitter url = https://github.com/nvim-treesitter/nvim-treesitter.git
[submodule ".config/zsh/ohmyzsh"] [submodule ".config/zsh/ohmyzsh"]
path = .config/zsh/ohmyzsh path = .config/zsh/ohmyzsh
url = https://github.com/ohmyzsh/ohmyzsh.git url = https://github.com/ohmyzsh/ohmyzsh.git