From 7be5373d8012b3cd262e25d22f047db5ffe01ef9 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 7 May 2023 16:14:55 +1000 Subject: [PATCH] Updated ZSH config Moved to .config/zsh folder Updated .zshrc to be a link --- .config/zsh/zshrc | 156 +++++++++++++++++++++++++++++++++++++++++++++ .zshrc | 159 +--------------------------------------------- 2 files changed, 157 insertions(+), 158 deletions(-) create mode 100644 .config/zsh/zshrc mode change 100644 => 120000 .zshrc diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc new file mode 100644 index 0000000..29e78d6 --- /dev/null +++ b/.config/zsh/zshrc @@ -0,0 +1,156 @@ +# If you come from bash you might have to change your $PATH. +export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH + +# set term +export TERM=xterm-256color + +# Path to your oh-my-zsh installation. +export ZSH="/home/$(whoami)/.config/ohmyzsh" + +# 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="fishy" + +# 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 the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to automatically update without prompting. +DISABLE_UPDATE_PROMPT="true" + +# Uncomment the following line to change how often to auto-update (in days). +export UPDATE_ZSH_DAYS=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. +# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work) +# See https://github.com/ohmyzsh/ohmyzsh/issues/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 + +# 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 dnf nmap pass rsync tmux) + +# 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='mvim' +# 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" +HIST_STAMPS="yyyy-mm-dd" +SAVEHIST=10000 # Number of entries +HISTSIZE=10000 +HISTFILE=~/.zsh_history # Where the history is stored +setopt APPEND_HISTORY # Don't erase history +setopt EXTENDED_HISTORY # Add additional data to history like timestamp +setopt INC_APPEND_HISTORY # Add immediately +setopt HIST_FIND_NO_DUPS # Don't show duplicates in search +setopt HIST_IGNORE_SPACE # Don't preserve spaces. You may want to turn it off +setopt NO_HIST_BEEP # Don't beep +setopt SHARE_HISTORY # Share history between session/terminals + +# set fpath +fpath=(~/.config/zsh/completion $fpath) + +# load the OMZ config +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" +# passes the unexpanded glob to the app if it doesnt match (the 'bash ' way of doing things with rsync/scp) +setopt nonomatch + +# You may need to manually set your language environment +export LANG=en_AU.UTF-8 + +# set XDG_ vars +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_RUNTIME_DIR=/run/user/$(id -u $(whoami)) + +# load ssh-agent +eval $(systemctl --user show-environment | grep SSH_AUTH_SOCK) +export SSH_AUTH_SOCK + +# gpg-agent +#GPG_TTY=$(tty) +#export GPG_TTY + + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# ssh +# export SSH_KEY_PATH="~/.ssh/rsa_id" + +# 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`. + +# load shell settings +test -r $XDG_CONFIG_HOME/shell/common && source $XDG_CONFIG_HOME/shell/common +test -r $XDG_CONFIG_HOME/shell/aliases && source $XDG_CONFIG_HOME/shell/aliases diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 30d8b33..0000000 --- a/.zshrc +++ /dev/null @@ -1,158 +0,0 @@ -# If you come from bash you might have to change your $PATH. -export PATH=$HOME/.local/bin:$HOME/.cargo/bin:$PATH - -# set term -export TERM=xterm-256color - -# Path to your oh-my-zsh installation. -export ZSH="/home/$(whoami)/.config/ohmyzsh" - -# 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="fishy" - -# 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 the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to automatically update without prompting. -DISABLE_UPDATE_PROMPT="true" - -# Uncomment the following line to change how often to auto-update (in days). -export UPDATE_ZSH_DAYS=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. -# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work) -# See https://github.com/ohmyzsh/ohmyzsh/issues/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 - -# 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 dnf nmap pass rsync tmux poetry) - -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='mvim' -# 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" -HIST_STAMPS="yyyy-mm-dd" -SAVEHIST=10000 # Number of entries -HISTSIZE=10000 -HISTFILE=~/.zsh_history # Where the history is stored -setopt APPEND_HISTORY # Don't erase history -setopt EXTENDED_HISTORY # Add additional data to history like timestamp -setopt INC_APPEND_HISTORY # Add immediately -setopt HIST_FIND_NO_DUPS # Don't show duplicates in search -setopt HIST_IGNORE_SPACE # Don't preserve spaces. You may want to turn it off -setopt NO_HIST_BEEP # Don't beep -setopt SHARE_HISTORY # Share history between session/terminals - -# set fpath -fpath=(~/.zsh/completion $fpath) - -# load the OMZ config -source $ZSH/oh-my-zsh.sh - -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" -# passes the unexpanded glob to the app if it doesnt match (the 'bash ' way of doing things with rsync/scp) -setopt nonomatch - -# You may need to manually set your language environment -export LANG=en_AU.UTF-8 - -# set XDG_ vars -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_RUNTIME_DIR=/run/user/$(id -u $(whoami)) - -# load ssh-agent -eval $(systemctl --user show-environment | grep SSH_AUTH_SOCK) -export SSH_AUTH_SOCK - -# gpg-agent -#GPG_TTY=$(tty) -#export GPG_TTY - - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# ssh -# export SSH_KEY_PATH="~/.ssh/rsa_id" - -# 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`. - -# load shell settings -test -r $XDG_CONFIG_HOME/shell/common && source $XDG_CONFIG_HOME/shell/common -test -r $XDG_CONFIG_HOME/shell/aliases && source $XDG_CONFIG_HOME/shell/aliases diff --git a/.zshrc b/.zshrc new file mode 120000 index 0000000..cbb0ffd --- /dev/null +++ b/.zshrc @@ -0,0 +1 @@ +/home/ben/.config/zsh/zshrc \ No newline at end of file