Compare commits

..

No commits in common. "cfb9bc1944d515b174cb96b9220df8e025245f41" and "b678d05e8cb419b57d3dfc91b0a4d27eb868cfbc" have entirely different histories.

8 changed files with 164 additions and 276 deletions

View File

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

View File

@ -0,0 +1,10 @@
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

View File

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

@ -0,0 +1,45 @@
# 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,13 +1,4 @@
--- ---
- 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
@ -16,63 +7,51 @@
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"
# ZSH - name: dotfiles -- Execute the antibody.sh
- name: dotiles -- create .config/zsh directory shell: /tmp/antibody.sh
file: become: yes
path: /home/{{ item.username }}/.config/zsh/ ignore_errors: yes
state: directory when: prompt == "zsh"
mode: '0755'
with_items: "{{ dotusers }}" - name: dotfiles -- Remove the antibody.sh
when: prompt == 'zsh' file: path=/tmp/antibody.sh state=absent
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 }}/.config/zsh/.zshrc dest: /home/{{ item.username }}/.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 zshenv - name: dotfiles -- Copy local zshrc.local
template: template:
src: files/dotfiles/zshenv src: files/dotfiles/zshrc.local
dest: /home/{{ item.username }}/.zshenv dest: /home/{{ item.username }}/.zshrc.local
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: dotiles -- clone zsh syntax-hightlighting - name: dotfiles -- Copy local zsh_plugins.txt
git: template:
repo: https://github.com/zsh-users/zsh-syntax-highlighting.git src: files/dotfiles/zsh_plugins.txt
dest: /home/{{ item.username }}/.config/zsh/zsh-syntax-highlighting dest: /home/{{ item.username }}/.zsh_plugins.txt
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:
@ -152,15 +131,6 @@
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:
@ -198,3 +168,12 @@
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,9 +1,20 @@
--- ---
# - 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: name: zsh
- zsh
- grml-zsh-config
state: present state: present
- name: Set shell for root to zsh - name: Set shell for root to zsh
@ -13,58 +24,3 @@
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'

View File

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