Feat: update zsh config

This commit is contained in:
Bertrand Benjamin 2021-06-15 10:33:52 +02:00
parent be522bbf36
commit 7ca8ed574f
6 changed files with 192 additions and 109 deletions

View File

@ -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

17
files/dotfiles/zshenv Normal file
View File

@ -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

View File

@ -1,5 +1,61 @@
# Created by newuser for 5.5.1 fpath+=$ZDOTDIR/pure
source <(antibody init)
antibody bundle < ~/.zsh_plugins.txt autoload -U compinit
PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin:$(yarn config get prefix)/bin" zstyle ':completion:*' menu select
source ~/.zshrc.local 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

View File

@ -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)

View File

@ -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 - name: dotfiles -- Copy tmux.conf
template: template:
src: files/dotfiles/tmux.conf src: files/dotfiles/tmux.conf
@ -7,51 +16,63 @@
group: "{{ item.group }}" group: "{{ item.group }}"
with_items: "{{ dotusers }}" 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 # ZSH
shell: /tmp/antibody.sh - name: dotiles -- create .config/zsh directory
become: yes file:
ignore_errors: yes path: /home/{{ item.username }}/.config/zsh/
when: prompt == "zsh" state: directory
mode: '0755'
- name: dotfiles -- Remove the antibody.sh with_items: "{{ dotusers }}"
file: path=/tmp/antibody.sh state=absent when: prompt == 'zsh'
when: prompt == "zsh"
- name: dotfiles -- Copy local zshrc - name: dotfiles -- Copy local zshrc
template: template:
src: files/dotfiles/zshrc src: files/dotfiles/zshrc
dest: /home/{{ item.username }}/.zshrc dest: /home/{{ item.username }}/.config/zsh/.zshrc
owner: "{{ item.username }}" owner: "{{ item.username }}"
group: "{{ item.group }}" group: "{{ item.group }}"
with_items: "{{ dotusers }}" with_items: "{{ dotusers }}"
when: prompt == 'zsh' when: prompt == 'zsh'
- name: dotfiles -- Copy local zshrc.local - name: dotfiles -- Copy local zshenv
template: template:
src: files/dotfiles/zshrc.local src: files/dotfiles/zshenv
dest: /home/{{ item.username }}/.zshrc.local dest: /home/{{ item.username }}/.zshenv
owner: "{{ item.username }}" owner: "{{ item.username }}"
group: "{{ item.group }}" group: "{{ item.group }}"
with_items: "{{ dotusers }}" with_items: "{{ dotusers }}"
when: prompt == 'zsh' when: prompt == 'zsh'
- name: dotfiles -- Copy local zsh_plugins.txt - name: dotiles -- clone zsh syntax-hightlighting
template: git:
src: files/dotfiles/zsh_plugins.txt repo: https://github.com/zsh-users/zsh-syntax-highlighting.git
dest: /home/{{ item.username }}/.zsh_plugins.txt dest: /home/{{ item.username }}/.config/zsh/zsh-syntax-highlighting
owner: "{{ item.username }}"
group: "{{ item.group }}"
with_items: "{{ dotusers }}" with_items: "{{ dotusers }}"
when: prompt == 'zsh' 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 # Fish config
- name: dotfiles -- Create fish config directory - name: dotfiles -- Create fish config directory
file: file:
@ -131,6 +152,15 @@
with_items: "{{ dotusers }}" with_items: "{{ dotusers }}"
when: editor == 'nvim' 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 # Alacritty terminal
- name: dotfiles -- Copy alacritty config - name: dotfiles -- Copy alacritty config
copy: copy:
@ -168,12 +198,3 @@
group: "{{ item.group }}" group: "{{ item.group }}"
with_items: "{{ dotusers }}" with_items: "{{ dotusers }}"
when: not server 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 }}"

View File

@ -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 - name: Install base CLI packages
pacman: pacman:
name: zsh name:
- zsh
- grml-zsh-config
state: present state: present
- name: Set shell for root to zsh - name: Set shell for root to zsh
@ -24,3 +13,58 @@
tags: tags:
- first_deployement - 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'