`284a3a2a38dcb8cb177653311ef7eee02e383db1`

Author: Pavle Portic <git@theedgeofrage.com>
Committer: Pavle Portic <git@theedgeofrage.com>
Date: 2021-09-29 00:56 UTC

Message

Use oh-my-zsh instead of antigen

Diff

This diff is truncated to protect this page.

  1diff --git a/dot_aliases b/dot_aliases
  2index b385a75c16f3cf5400de983445110da8137c5fd4..5a0764b6884cac0221b59055f3fce0aa65b2c48c 100644
  3--- a/dot_aliases
  4+++ b/dot_aliases
  5@@ -9,33 +9,34 @@ alias '......'='cd ../../../../..'
  6 alias '.......'='cd ../../../../../..'
  7 alias '........'='cd ../../../../../../..'
  8 alias '.........'='cd ../../../../../../../..'
  9-alias ls='ls --group-directories-first --color=always --time-style=long-iso'
 10-alias cl=clear
 11-alias cdl='cd ~/ && cl'
 12-alias rmr='rm -rIf'
 13-alias mkdir='mkdir -p'
 14-alias df='df -h'
 15-alias ran=ranger
 16-alias -g WC='| wc -l'
 17-alias rcp='rsync -rPv'
 18-alias cal='cal -m'
 19-alias grep='grep -Hn --color=always'
 20 alias -g NO='>/dev/null 2>&1'
 21+alias -g WC='| wc -l'
 22 alias -g clip='xclip -selection c'
 23-alias db='duplicity-backup -c ~/.config/duplicity-backup.conf'
 24-alias myip='curl -s https://icanhazip.com'
 25 alias -g vim='nvim'
 26 alias -g vimdiff='nvim -d'
 27-alias zfs='sudo zfs'
 28-alias zpool='sudo zpool'
 29-alias 'zpool import'='zpool import -d /dev/disk/by-id'
 30-alias fdisk='sudo fdisk'
 31-alias diff='diff -y --suppress-common-lines'
 32+alias cal='cal -m'
 33+alias cdl='cd ~/ && cl'
 34+alias cl=clear
 35 alias cz=chezmoi
 36+alias db='duplicity-backup -c ~/.config/duplicity-backup.conf'
 37+alias df='df -h'
 38+alias diff='diff -y --suppress-common-lines'
 39 alias dockre=docker
 40-alias unbound='cd ~/dev/docker/unbound; dcrestart; -'
 41+alias fdisk='sudo fdisk'
 42+alias grep='grep -Hn --color=always'
 43 alias i3exit='i3-msg exit'
 44+alias ls='ls --group-directories-first --color=always --time-style=long-iso'
 45+alias mkdir='mkdir -p'
 46 alias mpv='mpv --ytdl-format="bestvideo[height<=?1440]+bestaudio/best"'
 47+alias myip='curl -s https://icanhazip.com'
 48+alias ran=ranger
 49+alias rcp='rsync -rPv'
 50+alias rmr='rm -rIf'
 51+alias unbound='cd ~/dev/docker/unbound; dcrestart; -'
 52+alias virtualenv='python -m venv'
 53+alias zfs='sudo zfs'
 54+alias zpool='sudo zpool'
 55+alias 'zpool import'='zpool import -d /dev/disk/by-id'
 56 
 57 # Systemctl aliases
 58 alias sctl='sudo systemctl'
 59@@ -82,5 +83,3 @@ unalias -m 'ff'
 60 unalias -m '_'
 61 unalias -m 'please'
 62 unalias -m 'rm'
 63-unset -f 'ggf'
 64-unset -f 'ggfl'
 65diff --git a/dot_zshrc b/dot_zshrc
 66index 51beac5c2c7359308173cbe7701a5bd83277c2ca..1f04e0c062bd72a69d86b0a4fff8c99d6c3bb7c6 100644
 67--- a/dot_zshrc
 68+++ b/dot_zshrc
 69@@ -1,64 +1,64 @@
 70-# vim: ft=zsh
 71-# History settings
 72 HISTFILE=~/.histfile
 73 HISTSIZE=40000
 74 SAVEHIST=40000
 75+HIST_STAMPS="yyyy-mm-dd"
 76 setopt HIST_IGNORE_DUPS
 77 
 78-source ~/.local/share/antigen.zsh
 79-export DEFAULT_USER="pavle"
 80+export ZSH="$HOME/.config/zsh/oh-my-zsh"
 81+ZSH_CUSTOM="$HOME/.config/zsh"
 82+
 83+ZSH_THEME="boban"
 84+HYPHEN_INSENSITIVE="true"
 85+DISABLE_AUTO_UPDATE="true"
 86+
 87+# Uncomment the following line if pasting URLs and other text is messed up.
 88+# DISABLE_MAGIC_FUNCTIONS="true"
 89+
 90+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
 91+COMPLETION_WAITING_DOTS="true"
 92+
 93+plugins=(
 94+	archlinux
 95+	aws
 96+	colored-man-pages
 97+	common-aliases
 98+	docker
 99+	docker-compose
100+	git
101+	autoswitch-virtualenv
102+	you-should-use
103+	zsh-autosuggestions
104+	zsh-completions
105+	zsh-syntax-highlighting
106+)
107+
108+source $ZSH/oh-my-zsh.sh
109 
110-# Load the oh-my-zsh's library.
111-antigen use oh-my-zsh
112-
113-# Load plugins from oh-my-zsh
114-antigen bundle archlinux
115-antigen bundle aws
116-antigen bundle colored-man-pages
117-antigen bundle common-aliases
118-antigen bundle copybuffer
119-antigen bundle docker
120-antigen bundle docker-compose
121-antigen bundle extract
122-antigen bundle git
123-
124-# Additional antigen plugins
125-antigen bundle MichaelAquilina/zsh-you-should-use
126-antigen bundle TheEdgeOfRage/zsh-autoswitch-virtualenv
127-antigen bundle zsh-users/zsh-autosuggestions
128-antigen bundle zsh-users/zsh-completions
129-antigen bundle zsh-users/zsh-syntax-highlighting
130-
131-# Load theme
132-antigen theme https://gitea.theedgeofrage.com/TheEdgeOfRage/boban-zsh.git
133-antigen apply
134-
135-# Completion options
136 zstyle :compinstall filename '$HOME/.zshrc'
137-zstyle ':completion:*' menu select
138-fpath=(~/.config/zsh/completions ~/.config/zsh/functions $fpath)
139+# zstyle ':completion:*' menu select
140+fpath=(~/.config/zsh/functions $fpath)
141 autoload -Uz compinit && compinit
142 autoload -Uz ~/.config/zsh/functions/*
143 
144 # Misc options
145 setopt extendedglob notify
146-unsetopt autocd beep nomatch
147+unsetopt beep nomatch
148 bindkey -v
149 
150 source ~/.aliases
151 
152 # Variable exports
153-export PATH="$HOME/.local/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH"
154-export VISUAL="nvim"
155+export DEFAULT_USER="pavle"
156 export EDITOR="nvim"
157-export XDG_CONFIG_HOME="$HOME/.config"
158-export MAKEFLAGS="-j $(nproc --all)"
159 export GPG_TTY=$(tty)
160-export QT_QPA_PLATFORMTHEME="qt5ct"
161+export LANG="en_US.UTF-8"
162 export LC_ALL="en_DK.UTF-8"
163+export MAKEFLAGS="-j $(nproc --all)"
164 export MOZ_WEBRENDER=1
165-export AWS_PROFILE="edifice-dev"
166-export MINIKUBE_IN_STYLE=false
167+export PATH="$HOME/.local/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH"
168+export QT_QPA_PLATFORMTHEME="qt5ct"
169diff --git a/init.sh b/init.sh
170index de4130a705b1a23307d6ed3d3861f4193242bc70..ef4d051ba63df443b309e366f929838ab91ddf5e 100755
171--- a/init.sh
172+++ b/init.sh
173@@ -1,12 +1,4 @@
174-#!/bin/bash
175-#
176-# init.sh
177-# Copyright (C) 2020 pavle <pavle.portic@tilda.center>
178-#
179-# Distributed under terms of the BSD 3-Clause license.
180-#
181-
182-curl -L git.io/antigen > ~/.local/share/antigen.zsh
183+#!/bin/sh
184 
185 git clone https://github.com/liuchengxu/space-vim.git ~/.space-vim
186 cd ~/.space-vim
187@@ -17,3 +9,16 @@ cd -
188 git clone https://github.com/nikita-skobov/create-bash-script ~/.local/share/create-bash-script
189 git clone https://gitea.theedgeofrage.com/TheEdgeOfRage/rpn ~/.local/share/rpn
190 git clone https://github.com/TheEdgeOfRage/bumblebee-status ~/.local/share/bumblebee-status
191+
192+mkdir -p ~/.config/zsh/plugins
193+cd ~/.config/zsh
194+git clone https://github.com/TheEdgeOfRage/ohmyzsh oh-my-zsh
195+cd -
196+
197+cd ~/.config/zsh/plugins
198+git clone https://github.com/MichaelAquilina/zsh-you-should-use you-should-use
199+git clone https://github.com/TheEdgeOfRage/zsh-autoswitch-virtualenv autoswitch-virtualenv
200+git clone https://github.com/zsh-users/zsh-autosuggestions
201+git clone https://github.com/zsh-users/zsh-completions
202+git clone https://github.com/zsh-users/zsh-syntax-highlighting
203+cd -