remove omz dependency

3 files changed, 30 insertions, 105 deletions

diff --git a/omz/custom/func.zsh b/func.zsh
index 1005adc..a145758 100644
--- a/omz/custom/func.zsh
+++ b/func.zsh
@@ -1,5 +1,5 @@
 rh() {
-  rm ~/.zsh_history
+  rm -f ~/.zsh_history
   exec zsh
 }
 
diff --git a/install.conf.yaml b/install.conf.yaml
index ca34495..858a1ea 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -11,9 +11,6 @@
     ~/.gnupg:
       mode: 0700
 
-- shell:
-  - sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-
 - link:
     ~/.vimrc: vimrc
     ~/.zshrc:
@@ -22,9 +19,6 @@
     ~/.config/kitty/kitty.conf:
       path: kitty/kitty.conf
       create: true
-    ~/.oh-my-zsh/custom/func.zsh:
-      path: omz/custom/func.zsh
-      create: true
     ~/.gnupg/gpg-agent.conf:
       path: gpg-agent.conf
       create: true
diff --git a/zshrc b/zshrc
index 263f0b1..0706e94 100644
--- a/zshrc
+++ b/zshrc
@@ -1,115 +1,46 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+autoload -U compinit
+compinit
+zstyle ':completion:*:descriptions' format '%U%B%d%b%u'
+zstyle ':completion:*:warnings' format '%BSorry, no matches for: %d%b'
 
-# Path to your oh-my-zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
+setopt correct
 
-# 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="jnrowe"
+export HISTSIZE=2000
+export HISTFILE="$HOME/.history"
+export SAVEHIST=$HISTSIZE
+setopt hist_ignore_all_dups
+setopt hist_ignore_space
 
-# 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" )
+setopt autocd
+setopt extendedglob
 
-# 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.
-# 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 pass)
-
-source $ZSH/oh-my-zsh.sh
-
-# User configuration
+alias l="ls -lah"
+alias ll="ls -lh"
+alias okular="setsid okular"
 
-# export MANPATH="/usr/local/man:$MANPATH"
+export PATH="$HOME/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
 
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
+source $HOME/.dotfiles/*.zsh
 
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
+autoload -Uz vcs_info
+zstyle ':vcs_info:git*' formats '[%b] '
 
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
+precmd() { vcs_info }
+setopt prompt_subst
 
-ZSH_COMPDUMP=~/.cache/.zcompdump
+if [ $UID -eq 0 ]; then
+  local user_prompt=$'\U26A0\UFE0F'" %F{red}%n%f"
+else
+  local user_prompt="%F{green}%n%f"
+fi
 
-export PATH="$HOME/bin:$PATH"
-export PATH="$HOME/.local/bin:$PATH"
-export PATH="/usr/lib/distcc/bin:$PATH"
+export PS1='$user_prompt@%M %F{cyan}%2~%f ${vcs_info_msg_0_}%(?..%F{red}[%?]%f )%# '
 
-if [ ! -f $HOME/server ]; then
+if [ ! -f $HOME/server ] && [ ! $UID -eq 0 ]; then
   export GPG_TTY="$(tty)"
   export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-  gpgconf --kill gpg-agent
   gpgconf --launch gpg-agent
   gpg-connect-agent updatestartuptty /bye > /dev/null
   gpg-connect-agent "scd serialno" "learn --force" /bye > /dev/null
 fi
-
-# 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"
-alias okular="setsid okular"