Feat: enable zsh for combava

files/dotfiles/Xdefaults

@@ -1,6 +1,6 @@
 !*.font: xft:monospace:size=9
 ! URxvt*font: xft:Ubuntu Mono derivative Powerline:size=9
-URxvt*font: xft:Hack Nerd Font:pixelsize=14,xft:UbuntuMono Nerd Font:pixelsize=14
+URxvt*font: xft:Hack Nerd Font:pixelsize=12,xft:UbuntuMono Nerd Font:pixelsize=12
 ! URxvt*font: xft:Ubuntu Mono derivative Powerline:pixelsize=14,xft:Droid Sans Mono for Powerline:pixelsize=14,xft:DejaVu Sans Mono:pixelsize=14,xft:Droid Sans Fallback:pixelsize=14,xft:FreeSans:pixelsize=14,xft:FreeSans:pixelsize=14
 URxvt*scrollBar:        false
 
@@ -13,57 +13,86 @@ URxvt.resize-font.smaller: C-Down
 URxvt.resize-font.bigger: C-Up
 
 
-! URxvt.foreground: #f6f3e8
-! URxvt.background: #242424
-! URxvt.cursorColor: #f6f3e8
-*.foreground:   #fcfae1
-*.background:   #404040
-*.cursorColor:  #f595a7
-*.color0:       #404040
-*.color8:       #262626
-*.color1:       #b9454b
-*.color9:       #e75252
-*.color2:       #bd8d46
-*.color10:      #dea552
-*.color3:       #f6e497
-*.color11:      #d1c180
-*.color4:       #f595a7
-*.color12:      #d1a5ad
-*.color5:       #d28e2a
-*.color13:      #b47a24
-*.color6:       #ebcd4f
-*.color14:      #b9a659
-*.color7:       #fcfae1
-*.color15:      #f3f2e7
+! ! URxvt.foreground: #f6f3e8
+! ! URxvt.background: #242424
+! ! URxvt.cursorColor: #f6f3e8
+! *.foreground:   #fcfae1
+! *.background:   #404040
+! *.cursorColor:  #f595a7
+! *.color0:       #404040
+! *.color8:       #262626
+! *.color1:       #b9454b
+! *.color9:       #e75252
+! *.color2:       #bd8d46
+! *.color10:      #dea552
+! *.color3:       #f6e497
+! *.color11:      #d1c180
+! *.color4:       #f595a7
+! *.color12:      #d1a5ad
+! *.color5:       #d28e2a
+! *.color13:      #b47a24
+! *.color6:       #ebcd4f
+! *.color14:      #b9a659
+! *.color7:       #fcfae1
+! *.color15:      #f3f2e7
+! 
+!  
+! ! ! ANSI colours
+! ! ! black
+! ! URxvt.color0:               #073642
+! ! URxvt.color8:               #002636
+! ! ! red
+! ! URxvt.color1:               #dc322f
+! ! URxvt.color9:               #cb4b16
+! ! ! green
+! ! URxvt.color2:               #859900
+! ! URxvt.color10:              #586e75
+! ! ! yellow
+! ! URxvt.color3:               #b58900
+! ! URxvt.color11:              #657b83
+! ! ! blue
+! ! URxvt.color4:               #268bd2
+! ! URxvt.color12:              #839496
+! ! ! magenta
+! ! URxvt.color5:               #d33682
+! ! URxvt.color13:              #6c71c4
+! ! ! cyan
+! ! URxvt.color6:               #2aa198
+! ! URxvt.color14:              #93a1a1
+! ! ! white
+! ! URxvt.color7:               #eee8d5
+! ! URxvt.color15:              #fdf6e3
+! 
+! ! Colored man
+! URxvt.colorIT:      #87af5f
+! URxvt.colorBD:      #d7d7d7
+! URxvt.colorUL:      #87afd7
 
- 
-! ! ANSI colours
-! ! black
-! URxvt.color0:               #073642
-! URxvt.color8:               #002636
-! ! red
-! URxvt.color1:               #dc322f
-! URxvt.color9:               #cb4b16
-! ! green
-! URxvt.color2:               #859900
-! URxvt.color10:              #586e75
-! ! yellow
-! URxvt.color3:               #b58900
-! URxvt.color11:              #657b83
-! ! blue
-! URxvt.color4:               #268bd2
-! URxvt.color12:              #839496
-! ! magenta
-! URxvt.color5:               #d33682
-! URxvt.color13:              #6c71c4
-! ! cyan
-! URxvt.color6:               #2aa198
-! URxvt.color14:              #93a1a1
-! ! white
-! URxvt.color7:               #eee8d5
-! URxvt.color15:              #fdf6e3
-
-! Colored man
-URxvt.colorIT:      #87af5f
-URxvt.colorBD:      #d7d7d7
-URxvt.colorUL:      #87afd7
+! hard contrast: *background: #1d2021
+*background: #282828
+! soft contrast: *background: #32302f
+*foreground: #ebdbb2
+! Black + DarkGrey
+*color0:  #282828
+*color8:  #928374
+! DarkRed + Red
+*color1:  #cc241d
+*color9:  #fb4934
+! DarkGreen + Green
+*color2:  #98971a
+*color10: #b8bb26
+! DarkYellow + Yellow
+*color3:  #d79921
+*color11: #fabd2f
+! DarkBlue + Blue
+*color4:  #458588
+*color12: #83a598
+! DarkMagenta + Magenta
+*color5:  #b16286
+*color13: #d3869b
+! DarkCyan + Cyan
+*color6:  #689d6a
+*color14: #8ec07c
+! LightGrey + White
+*color7:  #a89984
+*color15: #ebdbb2

files/dotfiles/zsh_plugins.txt

@@ -1,10 +0,0 @@
-zsh-users/zsh-syntax-highlighting
-zsh-users/zsh-autosuggestions
-zsh-users/zsh-history-substring-search
-desyncr/auto-ls
-andrewferrier/fzf-z
-
-https://github.com/denysdovhan/spaceship-prompt spaceship
-
-
-

files/dotfiles/zshenv

@@ -0,0 +1,17 @@
+export TERM='rxvt-256color'
+
+# XDG
+export XDG_CONFIG_HOME=$HOME/.config
+
+# editor
+export EDITOR="nvim"
+export VISUAL="nvim"
+
+
+# zsh
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+export HISTFILE="$ZDOTDIR/.zhistory"    # History filepath
+export HISTSIZE=10000                   # Maximum events for internal history
+export SAVEHIST=10000                   # Maximum events in history file
+
+

files/dotfiles/zshrc

@@ -1,5 +1,61 @@
-# Created by newuser for 5.5.1
-source <(antibody init)
-antibody bundle < ~/.zsh_plugins.txt
-PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin:$(yarn config get prefix)/bin"
-source ~/.zshrc.local
+fpath+=$ZDOTDIR/pure
+
+autoload -U compinit
+zstyle ':completion:*' menu select
+zmodload zsh/complist
+compinit
+_comp_options+=(globdots)		# Include hidden files.
+
+# Prompt theme
+# git clone https://github.com/sindresorhus/pure ~/.config/zsh/
+autoload -U promptinit; promptinit
+prompt pure
+
+# Cursor for vimode
+# ZLE hooks for prompt's vi mode status
+function zle-line-init zle-keymap-select {
+	# Change the cursor style depending on keymap mode.
+	case $KEYMAP {
+		vicmd)
+			printf '\e[0 q' # Box.
+			;;
+
+		viins|main)
+			printf '\e[6 q' # Vertical bar.
+			;;
+	}
+}
+zle -N zle-line-init
+zle -N zle-keymap-select
+
+# Switch between vimode quickly
+export KEYTIMEOUT=1
+
+# Alias
+## Colors
+alias ls='ls --color'
+alias grep='grep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias egrep='egrep --color=auto'
+## Prompt when over right
+alias cp='cp -iv'
+alias mv='mv -iv'
+alias rm='rm -i'
+
+
+# Autosuggestions
+# git clone https://github.com/zsh-users/zsh-autosuggestions ~/.config/zsh/
+source ~/.config/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+ZSH_AUTOSUGGEST_STRATEGY=(history completion)
+
+# Syntax Highlight
+# git clone https://github.com/zsh-users/zsh-syntax-highlighting ~/.config/zsh/
+source ~/.config/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+# Auto-ls
+source ~/.config/zsh/auto-ls/auto-ls.zsh
+
+
+source /usr/share/fzf/key-bindings.zsh
+source /usr/share/fzf/completion.zsh
+

files/dotfiles/zshrc.local

@@ -1,45 +0,0 @@
-# Lines configured by zsh-newuser-install
-HISTFILE=~/.zsh_history
-HISTSIZE=1000
-SAVEHIST=1000
-setopt appendhistory nomatch
-# End of lines configured by zsh-newuser-install
-# The following lines were added by compinstall
-zstyle :compinstall filename '/home/lafrite/.zshrc'
-
-autoload -Uz compinit
-compinit
-# End of lines added by compinstall
-
-#  Autocompletion insensitive to case
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
-
-export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=245"
-# automatic color scheme with pywall
-
-# Vim keybindings
-bindkey -v
-
-# substring search
-bindkey '^[[A' history-substring-search-up
-bindkey '^[[B' history-substring-search-down
-
-bindkey -M vicmd 'k' history-substring-search-up
-bindkey -M vicmd 'j' history-substring-search-down
-
-# fzf
-source /usr/share/fzf/key-bindings.zsh
-source /usr/share/fzf/completion.zsh
-
-# fzf-z
-export FZFZ_EXTRA_DIRS="/media/documents/"
-
-# Alias
-alias notes="vim -c Note"
-# taskwarrior alias
-alias in="task add +in"
-
-export EDITOR="vim"
-
-# auto_ls pluting
-export AUTO_LS_COMMANDS=(ls git-status)

tasks/dotfiles.yml

@@ -1,4 +1,13 @@
 ---
+- name: dotfiles -- Copying Xdefaults
+  template:
+    src: files/dotfiles/Xdefaults
+    dest: /home/{{ item.username }}/.Xdefaults
+    owner: "{{ item.username }}"
+    group: "{{ item.group }}"
+  with_items: "{{ dotusers }}"
+
+# Tmux
 - name: dotfiles -- Copy tmux.conf
   template:
     src: files/dotfiles/tmux.conf
@@ -7,51 +16,63 @@
     group: "{{ item.group }}"
   with_items: "{{ dotusers }}"
 
-# Zsh config
-- name: dotfiles -- Download antibody
-  get_url:
-    url: https://raw.githubusercontent.com/getantibody/installer/master/install
-    dest: /tmp/antibody.sh
-    mode: 0770
-  when: prompt == "zsh"
 
-- name: dotfiles -- Execute the antibody.sh
-  shell: /tmp/antibody.sh
-  become: yes
-  ignore_errors: yes
-  when: prompt == "zsh"
-
-- name: dotfiles -- Remove the antibody.sh
-  file: path=/tmp/antibody.sh state=absent
-  when: prompt == "zsh"
+# ZSH
+- name: dotiles -- create .config/zsh directory
+    file:
+    path: /home/{{ item.username }}/.config/zsh/
+    state: directory
+    mode: '0755'
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
 
 - name: dotfiles -- Copy local zshrc
   template:
     src: files/dotfiles/zshrc
-    dest: /home/{{ item.username }}/.zshrc
+    dest: /home/{{ item.username }}/.config/zsh/.zshrc
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ dotusers }}"
   when: prompt == 'zsh'
 
-- name: dotfiles -- Copy local zshrc.local
+- name: dotfiles -- Copy local zshenv
   template:
-    src: files/dotfiles/zshrc.local
-    dest: /home/{{ item.username }}/.zshrc.local
+    src: files/dotfiles/zshenv
+    dest: /home/{{ item.username }}/.zshenv
     owner: "{{ item.username }}"
     group: "{{ item.group }}"
   with_items: "{{ dotusers }}"
   when: prompt == 'zsh'
 
-- name: dotfiles -- Copy local zsh_plugins.txt
-  template:
-    src: files/dotfiles/zsh_plugins.txt
-    dest: /home/{{ item.username }}/.zsh_plugins.txt
-    owner: "{{ item.username }}"
-    group: "{{ item.group }}"
+- name: dotiles -- clone zsh syntax-hightlighting
+  git:
+    repo: https://github.com/zsh-users/zsh-syntax-highlighting.git
+    dest: /home/{{ item.username }}/.config/zsh/zsh-syntax-highlighting
   with_items: "{{ dotusers }}"
   when: prompt == 'zsh'
 
+- name: dotiles -- clone zsh autosuggestions
+  git:
+    repo: https://github.com/zsh-users/zsh-autosuggestions.git
+    dest: /home/{{ item.username }}/.config/zsh/zsh-autosuggestions
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotiles -- clone zsh auto-ls
+  git:
+    repo: https://github.com/desyncr/auto-ls
+    dest: /home/{{ item.username }}/.config/zsh/auto-ls
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotiles -- clone zsh pure prompt
+  git:
+    repo: https://github.com/sindresorhus/pure.git
+    dest: /home/{{ item.username }}/.config/zsh/pure
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+
 # Fish config
 - name: dotfiles -- Create fish config directory
   file:
@@ -131,6 +152,15 @@
   with_items: "{{ dotusers }}"
   when: editor == 'nvim'
 
+# coc snippets
+- name: dotfiles -- Copying snippets
+  copy:
+    src: files/dotfiles/ultisnips/
+    dest: /home/{{ item.username }}/.config/coc/ultisnips
+    owner: "{{ item.username }}"
+    group: "{{ item.group }}"
+  with_items: "{{ dotusers }}"
+
 # Alacritty terminal
 - name: dotfiles -- Copy alacritty config
   copy:
@@ -168,12 +198,3 @@
     group: "{{ item.group }}"
   with_items: "{{ dotusers }}"
   when: not server
-
-# coc snippets
-- name: dotfiles -- Copying snippets
-  copy:
-    src: files/dotfiles/ultisnips/
-    dest: /home/{{ item.username }}/.config/coc/ultisnips
-    owner: "{{ item.username }}"
-    group: "{{ item.group }}"
-  with_items: "{{ dotusers }}"

tasks/zsh.yml

@@ -1,20 +1,9 @@
 ---
-# - name: download default grml configuration
-#   get_url:
-#     url: http://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
-#     dest: /etc/zsh/newuser.zshrc.recommended
-#     backup: yes
-# 
-# - name: download default grml configuration
-#   get_url:
-#     url: http://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
-#     dest: /etc/zsh/zshrc
-#     force: yes
-#     backup: yes
-
 - name: Install base CLI packages
   pacman:
-    name: zsh
+    name:
+        - zsh
+        - grml-zsh-config
     state: present
 
 - name: Set shell for root to zsh
@@ -24,3 +13,58 @@
   tags:
     - first_deployement
 
+
+# ZSH dotfiles
+- name: dotiles -- create .config/zsh directory
+    file:
+    path: /home/{{ item.username }}/.config/zsh/
+    state: directory
+    mode: '0755'
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotfiles -- Copy local zshrc
+  template:
+    src: files/dotfiles/zshrc
+    dest: /home/{{ item.username }}/.config/zsh/.zshrc
+    owner: "{{ item.username }}"
+    group: "{{ item.group }}"
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotfiles -- Copy local zshenv
+  template:
+    src: files/dotfiles/zshenv
+    dest: /home/{{ item.username }}/.zshenv
+    owner: "{{ item.username }}"
+    group: "{{ item.group }}"
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotiles -- clone zsh syntax-hightlighting
+  git:
+    repo: https://github.com/zsh-users/zsh-syntax-highlighting.git
+    dest: /home/{{ item.username }}/.config/zsh/zsh-syntax-highlighting
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotiles -- clone zsh autosuggestions
+  git:
+    repo: https://github.com/zsh-users/zsh-autosuggestions.git
+    dest: /home/{{ item.username }}/.config/zsh/zsh-autosuggestions
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotiles -- clone zsh auto-ls
+  git:
+    repo: https://github.com/desyncr/auto-ls
+    dest: /home/{{ item.username }}/.config/zsh/auto-ls
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'
+
+- name: dotiles -- clone zsh pure prompt
+  git:
+    repo: https://github.com/sindresorhus/pure.git
+    dest: /home/{{ item.username }}/.config/zsh/pure
+  with_items: "{{ dotusers }}"
+  when: prompt == 'zsh'

vars/Combava.yml

@@ -6,7 +6,7 @@ public_key:
     - user: "{{ me }}"
       key: id_ed25519_home.pub
 
-prompt: fish
+prompt: zsh
 editor: nvim
 
 autofs: