Use oh-my-zsh instead of antigen

dot_aliases

@@ -9,33 +9,34 @@ alias '......'='cd ../../../../..'
 alias '.......'='cd ../../../../../..'
 alias '........'='cd ../../../../../../..'
 alias '.........'='cd ../../../../../../../..'
-alias ls='ls --group-directories-first --color=always --time-style=long-iso'
-alias cl=clear
-alias cdl='cd ~/ && cl'
-alias rmr='rm -rIf'
-alias mkdir='mkdir -p'
-alias df='df -h'
-alias ran=ranger
-alias -g WC='| wc -l'
-alias rcp='rsync -rPv'
-alias cal='cal -m'
-alias grep='grep -Hn --color=always'
 alias -g NO='>/dev/null 2>&1'
+alias -g WC='| wc -l'
 alias -g clip='xclip -selection c'
-alias db='duplicity-backup -c ~/.config/duplicity-backup.conf'
-alias myip='curl -s https://icanhazip.com'
 alias -g vim='nvim'
 alias -g vimdiff='nvim -d'
+alias cal='cal -m'
+alias cdl='cd ~/ && cl'
+alias cl=clear
+alias cz=chezmoi
+alias db='duplicity-backup -c ~/.config/duplicity-backup.conf'
+alias df='df -h'
+alias diff='diff -y --suppress-common-lines'
+alias dockre=docker
+alias fdisk='sudo fdisk'
+alias grep='grep -Hn --color=always'
+alias i3exit='i3-msg exit'
+alias ls='ls --group-directories-first --color=always --time-style=long-iso'
+alias mkdir='mkdir -p'
+alias mpv='mpv --ytdl-format="bestvideo[height<=?1440]+bestaudio/best"'
+alias myip='curl -s https://icanhazip.com'
+alias ran=ranger
+alias rcp='rsync -rPv'
+alias rmr='rm -rIf'
+alias unbound='cd ~/dev/docker/unbound; dcrestart; -'
+alias virtualenv='python -m venv'
 alias zfs='sudo zfs'
 alias zpool='sudo zpool'
 alias 'zpool import'='zpool import -d /dev/disk/by-id'
-alias fdisk='sudo fdisk'
-alias diff='diff -y --suppress-common-lines'
-alias cz=chezmoi
-alias dockre=docker
-alias unbound='cd ~/dev/docker/unbound; dcrestart; -'
-alias i3exit='i3-msg exit'
-alias mpv='mpv --ytdl-format="bestvideo[height<=?1440]+bestaudio/best"'
 
 # Systemctl aliases
 alias sctl='sudo systemctl'
@@ -82,5 +83,3 @@ unalias -m 'ff'
 unalias -m '_'
 unalias -m 'please'
 unalias -m 'rm'
-unset -f 'ggf'
-unset -f 'ggfl'

dot_zshrc

@@ -1,64 +1,64 @@
-# vim: ft=zsh
-# History settings
 HISTFILE=~/.histfile
 HISTSIZE=40000
 SAVEHIST=40000
+HIST_STAMPS="yyyy-mm-dd"
 setopt HIST_IGNORE_DUPS
 
-source ~/.local/share/antigen.zsh
-export DEFAULT_USER="pavle"
+export ZSH="$HOME/.config/zsh/oh-my-zsh"
+ZSH_CUSTOM="$HOME/.config/zsh"
 
-# Load the oh-my-zsh's library.
-antigen use oh-my-zsh
+ZSH_THEME="boban"
+HYPHEN_INSENSITIVE="true"
+DISABLE_AUTO_UPDATE="true"
 
-# Load plugins from oh-my-zsh
-antigen bundle archlinux
-antigen bundle aws
-antigen bundle colored-man-pages
-antigen bundle common-aliases
-antigen bundle copybuffer
-antigen bundle docker
-antigen bundle docker-compose
-antigen bundle extract
-antigen bundle git
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
 
-# Additional antigen plugins
-antigen bundle MichaelAquilina/zsh-you-should-use
-antigen bundle TheEdgeOfRage/zsh-autoswitch-virtualenv
-antigen bundle zsh-users/zsh-autosuggestions
-antigen bundle zsh-users/zsh-completions
-antigen bundle zsh-users/zsh-syntax-highlighting
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+COMPLETION_WAITING_DOTS="true"
 
-# Load theme
-antigen theme https://gitea.theedgeofrage.com/TheEdgeOfRage/boban-zsh.git
-antigen apply
+plugins=(
+	archlinux
+	aws
+	colored-man-pages
+	common-aliases
+	docker
+	docker-compose
+	git
+	autoswitch-virtualenv
+	you-should-use
+	zsh-autosuggestions
+	zsh-completions
+	zsh-syntax-highlighting
+)
+
+source $ZSH/oh-my-zsh.sh
 
-# Completion options
 zstyle :compinstall filename '$HOME/.zshrc'
-zstyle ':completion:*' menu select
-fpath=(~/.config/zsh/completions ~/.config/zsh/functions $fpath)
+# zstyle ':completion:*' menu select
+fpath=(~/.config/zsh/functions $fpath)
 autoload -Uz compinit && compinit
 autoload -Uz ~/.config/zsh/functions/*
 
 # Misc options
 setopt extendedglob notify
-unsetopt autocd beep nomatch
+unsetopt beep nomatch
 bindkey -v
 
 source ~/.aliases
 
 # Variable exports
-export PATH="$HOME/.local/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH"
-export VISUAL="nvim"
+export DEFAULT_USER="pavle"
 export EDITOR="nvim"
-export XDG_CONFIG_HOME="$HOME/.config"
-export MAKEFLAGS="-j $(nproc --all)"
 export GPG_TTY=$(tty)
-export QT_QPA_PLATFORMTHEME="qt5ct"
+export LANG="en_US.UTF-8"
 export LC_ALL="en_DK.UTF-8"
+export MAKEFLAGS="-j $(nproc --all)"
 export MOZ_WEBRENDER=1
-export AWS_PROFILE="edifice-dev"
-export MINIKUBE_IN_STYLE=false
+export PATH="$HOME/.local/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH"
+export QT_QPA_PLATFORMTHEME="qt5ct"
+export VISUAL="nvim"
+export XDG_CONFIG_HOME="$HOME/.config"
 
 # Valve shader compiler
 export RADV_PERFTEST="aco"

init.sh

@@ -1,12 +1,4 @@
-#!/bin/bash
-#
-# init.sh
-# Copyright (C) 2020 pavle <pavle.portic@tilda.center>
-#
-# Distributed under terms of the BSD 3-Clause license.
-#
-
-curl -L git.io/antigen > ~/.local/share/antigen.zsh
+#!/bin/sh
 
 git clone https://github.com/liuchengxu/space-vim.git ~/.space-vim
 cd ~/.space-vim
@@ -17,3 +9,16 @@ cd -
 git clone https://github.com/nikita-skobov/create-bash-script ~/.local/share/create-bash-script
 git clone https://gitea.theedgeofrage.com/TheEdgeOfRage/rpn ~/.local/share/rpn
 git clone https://github.com/TheEdgeOfRage/bumblebee-status ~/.local/share/bumblebee-status
+
+mkdir -p ~/.config/zsh/plugins
+cd ~/.config/zsh
+git clone https://github.com/TheEdgeOfRage/ohmyzsh oh-my-zsh
+cd -
+
+cd ~/.config/zsh/plugins
+git clone https://github.com/MichaelAquilina/zsh-you-should-use you-should-use
+git clone https://github.com/TheEdgeOfRage/zsh-autoswitch-virtualenv autoswitch-virtualenv
+git clone https://github.com/zsh-users/zsh-autosuggestions
+git clone https://github.com/zsh-users/zsh-completions
+git clone https://github.com/zsh-users/zsh-syntax-highlighting
+cd -