From 7a75bcc46c6c905512be06bf0edb8580dd3d8229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Sch=C3=A4ferdiek?= <alexander@schaeferdiek.eu>
Date: Tue, 12 Dec 2023 23:08:52 +0100
Subject: [PATCH] Various updates - Use pure prompt for zsh by default - Add
 autojump, autosuggestions for zsh - Switch to dracula theme for vim and micro

---
 README.md                                   | 20 ++++++++++
 dot_config/micro/bindings.json              |  5 +++
 dot_config/micro/colorschemes/dracula.micro | 42 +++++++++++++++++++++
 dot_config/micro/settings.json              |  3 ++
 dot_vim/vimrc                               |  4 +-
 dot_zshenv                                  |  3 ++
 dot_zshrc                                   | 20 ++++++----
 7 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 dot_config/micro/bindings.json
 create mode 100644 dot_config/micro/colorschemes/dracula.micro
 create mode 100644 dot_config/micro/settings.json

diff --git a/README.md b/README.md
index 6040c6a..5efd44d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,25 @@
 # chezmoi dotfiles
 
+## Requirements
+
+The following should be installed (package names for ArchLinux):
+
+```shell
+zsh
+zsh-autosuggestions
+zsh-completions
+zsh-pure-prompt-git
+zsh-syntax-highlighting
+autojump
+nano
+nano-syntax-highlighting-git
+vim
+nano
+micro
+```
+
+## Init
+
 ```shell
 # init and clone on new machine
 chezmoi init --apply --verbose https://git.myservermanager.com/alexander.schaeferdiek/dotfiles-server.git
diff --git a/dot_config/micro/bindings.json b/dot_config/micro/bindings.json
new file mode 100644
index 0000000..c9979c2
--- /dev/null
+++ b/dot_config/micro/bindings.json
@@ -0,0 +1,5 @@
+{
+    "Alt-/": "lua:comment.comment",
+    "CtrlUnderscore": "lua:comment.comment",
+    "F4": "command:jumptag"
+}
diff --git a/dot_config/micro/colorschemes/dracula.micro b/dot_config/micro/colorschemes/dracula.micro
new file mode 100644
index 0000000..9f2cb71
--- /dev/null
+++ b/dot_config/micro/colorschemes/dracula.micro
@@ -0,0 +1,42 @@
+color-link default "#F8F8F2,#282A36"
+color-link comment "#6272A4"
+
+color-link identifier "#50FA7B"
+color-link identifier.class "#8BE9FD"
+color-link identifier.var "#F8F8F2"
+
+color-link constant "#BD93F9"
+color-link constant.number "#F8F8F2"
+color-link constant.string "#F1FA8C"
+
+color-link symbol "#FF79C6"
+color-link symbol.brackets "#F8F8F2"
+color-link symbol.tag "#AE81FF"
+
+color-link type "italic #8BE9FD"
+color-link type.keyword "#FF79C6"
+
+color-link special "#FF79C6"
+color-link statement "#FF79C6"
+color-link preproc "#FF79C6"
+
+color-link underlined "#FF79C6"
+color-link error "bold #FF5555"
+color-link todo "bold #FF79C6"
+
+color-link diff-added "#50FA7B"
+color-link diff-modified "#FFB86C"
+color-link diff-deleted "#FF5555"
+
+color-link gutter-error "#FF5555"
+color-link gutter-warning "#E6DB74"
+
+color-link statusline "#282A36,#F8F8F2"
+color-link tabbar "#282A36,#F8F8F2"
+color-link indent-char "#6272A4"
+color-link line-number "#6272A4"
+color-link current-line-number "#F8F8F2"
+
+color-link cursor-line "#44475A,#F8F8F2"
+color-link color-column "#44475A"
+color-link type.extended "default"
diff --git a/dot_config/micro/settings.json b/dot_config/micro/settings.json
new file mode 100644
index 0000000..d3ab797
--- /dev/null
+++ b/dot_config/micro/settings.json
@@ -0,0 +1,3 @@
+{
+    "colorscheme": "dracula"
+}
diff --git a/dot_vim/vimrc b/dot_vim/vimrc
index 5054f6c..ced4b76 100644
--- a/dot_vim/vimrc
+++ b/dot_vim/vimrc
@@ -33,8 +33,8 @@ call plug#begin('~/.vim/plugged')
 " Initialize plugin system
 call plug#end()
 
-colorscheme base16-atelier-forest
-"colorscheme dracula
+"colorscheme base16-atelier-forest
+colorscheme dracula
 
 if has('gui_running')
 	set go=m
diff --git a/dot_zshenv b/dot_zshenv
index ce2ff3a..38a5164 100644
--- a/dot_zshenv
+++ b/dot_zshenv
@@ -1,2 +1,5 @@
 # misc
 export EDITOR="vim"
+
+# fzf theme (dracula)
+export FZF_DEFAULT_OPTS='--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4'
\ No newline at end of file
diff --git a/dot_zshrc b/dot_zshrc
index 772771a..1cd7b0b 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -1,13 +1,9 @@
-# This configuration makes use of zsh-syntax-highlighting.
-# Some alias will call pre-defined applications.
-# Ensure to install them if a command is not working.
-#
 # SETTINGS
-autoload -U compinit promptinit
+autoload -U compinit promptinit; promptinit
 autoload -U colors && colors
 compinit
-promptinit
-prompt walters
+zstyle :prompt:pure:git:stash show yes
+prompt pure
 zstyle ':completion:*' menu select
 setopt completealiases
 setopt HIST_IGNORE_DUPS
@@ -116,3 +112,13 @@ if [ -f "/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.
 	ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
 	source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 fi
+
+# AUTO SUGGESTIONS
+if [ -f "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" ]; then
+    source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+fi
+
+# AUTOJUMP
+if [ -f "/usr/share/autojump/autojump.zsh" ]; then
+    source /usr/share/autojump/autojump.zsh
+fi
\ No newline at end of file