Merge remote-tracking branch 'origin/master'

files/dotfiles/alacritty/alacritty.yml

@@ -0,0 +1,93 @@
+# Colors (Gruvbox dark)
+colors:
+  # Default colors
+  primary:
+    # hard contrast: background = '#1d2021'
+    # background: '#282828'
+    # soft contrast: background = '#32302f'
+    background: '#32302f'
+    foreground: '#ebdbb2'
+
+  # Normal colors
+  normal:
+    black:   '#282828'
+    red:     '#cc241d'
+    green:   '#98971a'
+    yellow:  '#d79921'
+    blue:    '#458588'
+    magenta: '#b16286'
+    cyan:    '#689d6a'
+    white:   '#a89984'
+
+  # Bright colors
+  bright:
+    black:   '#928374'
+    red:     '#fb4934'
+    green:   '#b8bb26'
+    yellow:  '#fabd2f'
+    blue:    '#83a598'
+    magenta: '#d3869b'
+    cyan:    '#8ec07c'
+    white:   '#ebdbb2'
+
+font:
+  normal:
+    family: "UbuntuMono Nerd Font"
+    style: Regular
+  bold:
+    family: "UbuntuMono Nerd Font"
+    style: Bold
+  italic:
+    family: "UbuntuMono Nerd Font"
+    style: Italic
+  bold_italic:
+    family: "UbuntuMono Nerd Font"
+    style: Bold Italic
+   
+  # Point size
+  size: 12.0
+
+  offset:
+    x: 0
+    y: 0
+  glyph_offset:
+    x: 0
+    y: 0
+
+window:
+  decorations: none
+  padding:
+    x: 2
+    y: 2
+
+  dimensions:
+    columns: 100
+    lines: 20
+
+scrolling:
+  # Maximum number of lines in the scrollback buffer.
+  # Specifying '0' will disable scrolling.
+  history: 10000
+
+  # Number of lines the viewport will move for every line scrolled when
+  # scrollback is enabled (history > 0).
+  multiplier: 10
+
+# If `true`, bold text is drawn using the bright color variants.
+draw_bold_text_with_bright_colors: true
+
+selection:
+  semantic_escape_chars: ',│`|:"'' ()[]{}<>'
+  save_to_clipboard: true
+
+live_config_reload: true
+
+key_bindings:
+  - { key: V, mods: Control|Shift, action: Paste }
+  - { key: C, mods: Control|Shift, action: Copy }
+  - { key: Key0, mods: Control, action: ResetFontSize }
+  - { key: Equals, mods: Control, action: IncreaseFontSize }
+  - { key: Add, mods: Control, action: IncreaseFontSize }
+  - { key: Subtract, mods: Control, action: DecreaseFontSize }
+  - { key: Minus, mods: Control, action: DecreaseFontSize }
+  - { key: N, mods: Control, action: SpawnNewInstance }

files/dotfiles/newsboat/urls

@@ -41,6 +41,7 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UChkpEJqHjX-tGmYoGf8jdGA "Es
 https://www.youtube.com/feeds/videos.xml?channel_id=UCgkhWgBGRp0sdFy2MHDWfSg "Math" "El Ji"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCYO_jab_esuFRV4b17AJtAw "Math" "3Blue1Brown"
 
+https://www.youtube.com/feeds/videos.xml?channel_id=UC8ENHE5xdFSwx71u3fDH5Xw "Vim" "ThePrimeagen"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCs_AZuYXi6NA9tkdbhjItHQ "AdminSys" "Xavki"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCvjgXvBlbQiydffZU7m1_aw "Programmation" "~Coding Train"
 https://www.youtube.com/feeds/videos.xml?channel_id=UCj_iGliGCkLcHSZ8eqVNPDQ "Programmation" "~Grafikart.fr"

files/dotfiles/nvim/autoload/plugged/Zenburn

@@ -0,0 +1 @@
+Subproject commit ec6f369a000602e37e7c066b725f9d6bd12538f4

files/dotfiles/nvim/autoload/plugged/coc.nvim

@@ -0,0 +1 @@
+Subproject commit 688776cf68e1199ca96dca1fb169182dddb95a98

files/dotfiles/nvim/autoload/plugged/fzf

@@ -0,0 +1 @@
+Subproject commit f81feb1e69e5cb75797d50817752ddfe4933cd68

files/dotfiles/nvim/autoload/plugged/fzf.vim

@@ -0,0 +1 @@
+Subproject commit 7a655179a43cd431862a2bf5d297d9e55fd3f814

files/dotfiles/nvim/autoload/plugged/goyo.vim

@@ -0,0 +1 @@
+Subproject commit 6b6ed2734084fdbb6315357ddcaecf9c8e6f143d

files/dotfiles/nvim/autoload/plugged/indentLine

@@ -0,0 +1 @@
+Subproject commit 15aceda8c4eea621b66faa8673fca0b9fbe2f457

files/dotfiles/nvim/autoload/plugged/lightline.vim

@@ -0,0 +1 @@
+Subproject commit c172131e0369672bc1b9454a2aec6d532d350dcc

files/dotfiles/nvim/autoload/plugged/vim-fugitive

@@ -0,0 +1 @@
+Subproject commit caf3b1d5696e8d39a905e48f1e89d8c0c565168c

files/dotfiles/nvim/autoload/plugged/vim-repeat

@@ -0,0 +1 @@
+Subproject commit c947ad2b6a16983724a0153bdf7f66d7a80a32ca

files/dotfiles/nvim/autoload/plugged/vim-signify

@@ -0,0 +1 @@
+Subproject commit dfa1e55fe1c7f309f8cce4db0243f14f6edb2d4c

files/dotfiles/nvim/autoload/plugged/vim-snippets

@@ -0,0 +1 @@
+Subproject commit 087d3e7c72912baeb6b1d7ba626e61d50092c848

files/dotfiles/nvim/autoload/plugged/vim-surround

@@ -0,0 +1 @@
+Subproject commit f51a26d3710629d031806305b6c8727189cd1935

files/dotfiles/nvim/autoload/plugged/vim-tmux-navigator

@@ -0,0 +1 @@
+Subproject commit 44ba6fbe45895cd541ebfc87606add5c76e3829b

files/dotfiles/nvim/autoload/plugged/vimtex

@@ -0,0 +1 @@
+Subproject commit d777cb13f23ee1de0d19f4146cab67e3b8fd4681

files/dotfiles/nvim/general/mappings.vim

@@ -0,0 +1,10 @@
+" Better window navigation
+" nnoremap <C-h> <C-w>h
+" nnoremap <C-j> <C-w>j
+" nnoremap <C-k> <C-w>k
+" nnoremap <C-l> <C-w>l
+
+" Align blocks of text and keep them selected
+vmap < <gv
+vmap > >gv
+

files/dotfiles/nvim/general/settings.vim

@@ -0,0 +1,54 @@
+" set leader key
+let g:mapleader = "\<Space>"
+
+syntax enable                           " Enables syntax highlighing
+set hidden                              " Required to keep multiple buffers open multiple buffers
+set wrap                                " Display long lines as just one line
+set pumheight=10                        " Makes popup menu smaller
+set encoding=utf-8                      " The encoding displayed
+set fileencoding=utf-8                  " The encoding written to file
+set ruler                               " Show the cursor position all the time
+set cmdheight=1                         " More space for displaying messages
+set iskeyword+=-                        " treat dash separated words as a word text object"
+set mouse=a                             " Enable your mouse
+set t_Co=256                            " Support 256 colors
+
+set conceallevel=0                      " So that I can see `` in markdown files
+set tabstop=4                           " Insert 2 spaces for a tab
+set shiftwidth=4                        " Change the number of space characters inserted for indentation
+set smarttab                            " Makes tabbing smarter will realize you have 2 vs 4
+set expandtab                           " Converts tabs to spaces
+set smartindent                         " Makes indenting smart
+set autoindent                          " Good auto indent
+set foldmethod=indent
+
+set laststatus=2                        " Always display the status line
+
+set relativenumber                      " Relative line number
+set cursorline                          " Enable highlighting of the current line
+set showtabline=1                       " show tabs only when there are some
+
+set background=dark                     " tell vim what the background color looks like
+
+set nobackup                            " This is recommended by coc
+set nowritebackup                       " This is recommended by coc
+set noswapfile
+
+set updatetime=300                      " Faster completion
+set timeoutlen=500                      " By default timeoutlen is 1000 ms
+
+set clipboard=unnamedplus               " Copy paste between vim and everything else
+
+set showmode                            " Display edition mode
+"set noshowmode                          " We don't need to see things like -- INSERT -- anymore
+
+set incsearch                           " hightlight while searching
+set ignorecase                          " Ignore case while searching
+set smartcase                           " Override ignorecase if search patern contains upper case
+set wildmenu                            " Enable wildmenu
+
+"set autochdir                           " Your working directory will always be the same as your working directory
+
+execute "set colorcolumn=" . join(range(81,335), ',')
+
+colorscheme zenburn

files/dotfiles/nvim/init.vim

@@ -0,0 +1,10 @@
+source $HOME/.config/nvim/vim-plug/plugins.vim
+source $HOME/.config/nvim/general/settings.vim
+source $HOME/.config/nvim/general/mappings.vim
+
+source $HOME/.config/nvim/plug-config/fzf.vim
+source $HOME/.config/nvim/plug-config/coc.vim
+source $HOME/.config/nvim/plug-config/coc-snippets.vim
+source $HOME/.config/nvim/plug-config/vimtex.vim
+
+

files/dotfiles/nvim/plug-config/coc-snippets.vim

@@ -0,0 +1,25 @@
+inoremap <silent><expr> <TAB>
+      \ pumvisible() ? coc#_select_confirm() :
+      \ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
+      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#refresh()
+
+function! s:check_back_space() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
+
+let g:coc_snippet_next = '<tab>'
+
+" <Tab> and <S-Tab> to navigate between choices
+inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+
+" <cr> to validate selected autocompletion
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+
+" Use <C-j> for jump to next placeholder, it's default of coc.nvim
+let g:coc_snippet_next = '<c-j>'
+
+" Use <C-k> for jump to previous placeholder, it's default of coc.nvim
+let g:coc_snippet_prev = '<c-k>'

files/dotfiles/nvim/plug-config/fzf.vim

@@ -0,0 +1,70 @@
+" This is the default extra key bindings
+let g:fzf_action = {
+  \ 'ctrl-t': 'tab split',
+  \ 'ctrl-x': 'split',
+  \ 'ctrl-v': 'vsplit' }
+
+" Enable per-command history.
+" CTRL-N and CTRL-P will be automatically bound to next-history and
+" previous-history instead of down and up. If you don't like the change,
+" explicitly bind the keys to down and up in your $FZF_DEFAULT_OPTS.
+let g:fzf_history_dir = '~/.local/share/fzf-history'
+
+map <leader>b :Buffers<CR>
+nnoremap <leader>e :Files<CR>
+nnoremap <leader>g :Rg<CR>
+nnoremap <leader>t :Tags<CR>
+nnoremap <leader>m :Marks<CR>
+
+
+let g:fzf_tags_command = 'ctags -R'
+" Border color
+let g:fzf_layout = {'up':'~90%', 'window': { 'width': 0.8, 'height': 0.8,'yoffset':0.5,'xoffset': 0.5, 'highlight': 'Todo', 'border': 'sharp' } }
+
+let $FZF_DEFAULT_OPTS = '--layout=reverse --info=inline'
+let $FZF_DEFAULT_COMMAND="rg --files --hidden"
+
+
+" Customize fzf colors to match your color scheme
+let g:fzf_colors =
+\ { 'fg':      ['fg', 'Normal'],
+  \ 'bg':      ['bg', 'Normal'],
+  \ 'hl':      ['fg', 'Comment'],
+  \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
+  \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
+  \ 'hl+':     ['fg', 'Statement'],
+  \ 'info':    ['fg', 'PreProc'],
+  \ 'border':  ['fg', 'Ignore'],
+  \ 'prompt':  ['fg', 'Conditional'],
+  \ 'pointer': ['fg', 'Exception'],
+  \ 'marker':  ['fg', 'Keyword'],
+  \ 'spinner': ['fg', 'Label'],
+  \ 'header':  ['fg', 'Comment'] }
+
+"Get Files
+command! -bang -nargs=? -complete=dir Files
+    \ call fzf#vim#files(<q-args>, fzf#vim#with_preview({'options': ['--layout=reverse', '--info=inline']}), <bang>0)
+
+
+" Get text in files with Rg
+command! -bang -nargs=* Rg
+  \ call fzf#vim#grep(
+  \   'rg --column --line-number --no-heading --color=always --smart-case '.shellescape(<q-args>), 1,
+  \   fzf#vim#with_preview(), <bang>0)
+
+" Ripgrep advanced
+function! RipgrepFzf(query, fullscreen)
+  let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case %s || true'
+  let initial_command = printf(command_fmt, shellescape(a:query))
+  let reload_command = printf(command_fmt, '{q}')
+  let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command]}
+  call fzf#vim#grep(initial_command, 1, fzf#vim#with_preview(spec), a:fullscreen)
+endfunction
+
+command! -nargs=* -bang RG call RipgrepFzf(<q-args>, <bang>0)
+
+" Git grep
+command! -bang -nargs=* GGrep
+  \ call fzf#vim#grep(
+  \   'git grep --line-number '.shellescape(<q-args>), 0,
+  \   fzf#vim#with_preview({'dir': systemlist('git rev-parse --show-toplevel')[0]}), <bang>0)

files/dotfiles/nvim/plug-config/vimtex.vim

@@ -0,0 +1,24 @@
+let maplocalleader = "\<Space>"
+
+let g:tex_conceal = ""
+
+let g:vimtex_compiler_latexmk = {
+            \ 'backend' : 'nvim',
+            \ 'background' : 1,
+            \ 'build_dir' : '',
+            \ 'callback' : 0,
+            \ 'continuous' : 1,
+            \ 'options' : [
+            \   '-pdf',
+            \   '-verbose',
+            \   '-file-line-error',
+            \   '-synctex=1',
+            \   '-interaction=nonstopmode',
+            \   '-silent',
+            \   '-shell-escape',
+            \ ],
+            \}
+let g:vimtex_view_method = 'zathura'
+
+" Les fichiers sty et cls sont vus comme des fichiers tex
+autocmd BufRead,BufNewFile *.{sty,cls} setlocal syntax=tex

files/dotfiles/nvim/vim-plug/plugins.vim

@@ -0,0 +1,34 @@
+" auto-install vim-plug
+if empty(glob('~/.config/nvim/autoload/plug.vim'))
+  silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
+    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+  "autocmd VimEnter * PlugInstall
+  "autocmd VimEnter * PlugInstall | source $MYVIMRC
+endif
+
+call plug#begin('~/.config/nvim/autoload/plugged')
+
+    Plug 'jnurmine/Zenburn'
+    Plug 'itchyny/lightline.vim'
+
+    "Plug 'tpope/vim-sensible'
+    Plug 'tpope/vim-fugitive'
+    Plug 'tpope/vim-surround'
+    Plug 'tpope/vim-repeat'
+
+    Plug 'junegunn/goyo.vim'
+    Plug 'christoomey/vim-tmux-navigator'
+    Plug 'Yggdroot/indentLine'
+
+    Plug 'lervag/vimtex'
+
+    "Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+    Plug 'junegunn/fzf.vim'
+
+    Plug 'neoclide/coc.nvim', {'branch': 'release'}
+    Plug 'honza/vim-snippets'
+
+    Plug 'mhinz/vim-signify'
+    Plug 'tpope/vim-fugitive'
+
+call plug#end()

files/dotfiles/vim/config/plugins.vim

@@ -44,7 +44,7 @@ let g:ale_sign_warning = '⚐'
 " Search and switch buffers
 nmap <leader>b :Buffers<cr>
 " Find files by name under the current directory
-nmap <leader>f :Files<cr>
+nmap <leader>f :GFiles<cr>
 " Find files by name under the home directory
 nmap <leader>h :Files ~/<cr>
 " Search content in the current file

tasks/arch_CLI_packages.yml

@@ -32,13 +32,14 @@
       - autofs
       - bind-tools
       - unzip
-      - fzf
       - ntfs-3g
       - git-annex
       - cifs-utils
       - gnupg
       - traceroute
       - smartmontools
+      - ripgrep
+      - fzf
     state: present
   tags:
     - first_deployement
@@ -54,6 +55,8 @@
       - profanity
       - neomutt
       - youtube-dl
+      - neovim
+      - python-pynvim
     state: present
   when: not minimal or not server
 

tasks/arch_graphicals.yml

@@ -25,6 +25,7 @@
       - zathura-pdf-mupdf
       - xdotool
       - guvcview
+      - alacritty
     state: present
 
 - name: Install 3D printing packages
@@ -78,23 +79,25 @@
     - ttf-droid-sans-mono-slashed-powerline-git
     - ttf-literation-mono-powerline-git
     - ttf-opendyslexic
+    - nerd-fonts-ubuntu-mono
+    - nerd-fonts-droid-sans-mono
   become: yes
   become_user: aur_builder
 
-- name: Download st
-  git:
-    repo: https://git.opytex.org/lafrite/st.git
-    dest: /home/aur_builder/st
-  register: st_update
-  become: yes
-  become_user: aur_builder
-
-- name: Install st
-  command: "makepkg -si --noconfirm"
-  args:
-    chdir: "/home/aur_builder/st/"
-  when: st_update is changed
-  become: yes
-  become_user: aur_builder
+  # - name: Download st
+  #   git:
+  #     repo: https://git.opytex.org/lafrite/st.git
+  #     dest: /home/aur_builder/st
+  #   register: st_update
+  #   become: yes
+  #   become_user: aur_builder
+  # 
+  # - name: Install st
+  #   command: "makepkg -si --noconfirm"
+  #   args:
+  #     chdir: "/home/aur_builder/st/"
+  #   when: st_update is changed
+  #   become: yes
+  #   become_user: aur_builder
 
 

tasks/dotfiles.yml

@@ -81,6 +81,7 @@
   register: fishplugin
 
 # Vim config
+#
 - name: dotfiles -- Copy .vim/
   copy:
     src: files/dotfiles/vim/
@@ -111,6 +112,41 @@
     group: "{{ item.group }}"
   with_items: "{{ me }}"
 
+# Neovim config
+- name: dotfiles -- Copy nvim config
+  copy:
+    src: files/dotfiles/nvim
+    dest: /home/{{ item.username }}/.config/nvim
+    owner: "{{ item.username }}"
+    group: "{{ item.group }}"
+  with_items: "{{ me }}"
+  when: editor == 'nvim'
+
+- name: dotfiles -- Creates nvim/autoload/
+  file:
+    path: /home/{{ item.username }}/.config/nvim/autoload/
+    state: directory
+  with_items: "{{ me }}"
+  when: editor == 'nvim'
+
+- name: dotfiles -- Download plug.vim for nvim
+  get_url:
+    url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+    dest: /home/{{ item.username }}/.config/nvim/autoload/plug.vim
+    owner: "{{ item.username }}"
+    group: "{{ item.group }}"
+  with_items: "{{ me }}"
+  when: editor == 'nvim'
+
+# Alacritty terminal
+- name: dotfiles -- Copy alacritty config
+  copy:
+    src: files/dotfiles/alacritty
+    dest: /home/{{ item.username }}/.config/alacritty
+    owner: "{{ item.username }}"
+    group: "{{ item.group }}"
+  with_items: "{{ me }}"
+
 # Ssh config
 - name: dotfiles -- Creates .ssh
   file:

vars/Choux.yml

@@ -1,5 +1,6 @@
 ---
 prompt: fish
+editor: nvim
 
 deploy_public_key: id_ed25519_home.pub