From 1d0400b6f1d82f232874504ae46668afbcc1117c Mon Sep 17 00:00:00 2001 From: Alexander Kiryukhin Date: Mon, 10 Jan 2022 22:54:06 +0300 Subject: [PATCH] Update --- .gitmodules | 6 +++ install.sh | 4 +- nvim/nvim | 1 + zsh/omz | 1 + zsh/zshrc | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 120000 nvim/nvim create mode 160000 zsh/omz create mode 100644 zsh/zshrc diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6aa735f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "oh-my-zsh"] + path = zsh/omz + url = https://github.com/ohmyzsh/ohmyzsh +[submodule "zsh/omz"] + path = zsh/omz + url = https://github.com/ohmyzsh/ohmyzsh.git diff --git a/install.sh b/install.sh index a95b4f5..f13c444 100755 --- a/install.sh +++ b/install.sh @@ -3,4 +3,6 @@ ln -s $(pwd)/nvim ${HOME}/.config/nvim ln -s $(pwd)/git/config ${HOME}/.gitconfig ln -s $(pwd)/git/ignore ${HOME}/.gitignore -ln -s $(pwd)/fish ${HOME}/.config/fish +ln -s $(pwd)/zsh/omz ${HOME}/.oh-my-zsh +ln -s $(pwd)/zsh/zshrc ${HOME}/.zshrc + diff --git a/nvim/nvim b/nvim/nvim new file mode 120000 index 0000000..f767680 --- /dev/null +++ b/nvim/nvim @@ -0,0 +1 @@ +/Users/neonxp/dev/dotfiles/nvim \ No newline at end of file diff --git a/zsh/omz b/zsh/omz new file mode 160000 index 0000000..67cc59b --- /dev/null +++ b/zsh/omz @@ -0,0 +1 @@ +Subproject commit 67cc59b4258a13232cddfddd75f44d8ca2b80172 diff --git a/zsh/zshrc b/zsh/zshrc new file mode 100644 index 0000000..63301a6 --- /dev/null +++ b/zsh/zshrc @@ -0,0 +1,133 @@ +# If you come from bash you might have to change your $PATH. +export PATH=$HOME/.bin:/usr/local/bin:$HOME/go/bin:$PATH +alias pomodoro=/Users/neonxp/go/bin/pomodoro +alias docker=podman +# Path to your oh-my-zsh installation. +export ZSH="/Users/neonxp/.oh-my-zsh" +export EDITOR="/usr/local/bin/micro" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time oh-my-zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="robbyrussell" + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=yellow,underline" + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. + + +plugins=(git zsh-autosuggestions fzf) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions + if [[ -n $SSH_CONNECTION ]]; then + export EDITOR='vim' + else + export EDITOR='nvim' + fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + +### Added by Zinit's installer +if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then + print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f" + command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit" + command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \ + print -P "%F{33} %F{34}Installation successful.%f%b" || \ + print -P "%F{160} The clone has failed.%f%b" +fi + +source "$HOME/.local/share/zinit/zinit.git/zinit.zsh" +autoload -Uz _zinit +(( ${+_comps} )) && _comps[zinit]=_zinit + +# Load a few important annexes, without Turbo +# (this is currently required for annexes) +zinit light-mode for \ + zdharma-continuum/zinit-annex-as-monitor \ + zdharma-continuum/zinit-annex-bin-gem-node \ + zdharma-continuum/zinit-annex-patch-dl \ + zdharma-continuum/zinit-annex-rust + +### End of Zinit's installer chunk