Corerction : ré-écriture du script de mise à jour des dépôts Git

bin/updateall

@@ -1,28 +1,32 @@
 #!/bin/bash
 
-# Variable
+# Variables
-commands_d="${HOME}/.local/share/updateall/commands.d"
+realpath="$(readlink -f "$0")"
 
-# Function
+# cd
-# Create a clear separator, adapts to the screen size
+cd "$(dirname "$realpath")/../share/$(basename "$realpath")" || exit
-function separator {
+unset realpath
-    local separator=""
 
-    local name="$1"     ; shift
+# Fonction pour fabriquer une ligne de la longueur d'un tiers du terminal
-    local char="${1:-=}"; shift
+makeline() {
-    (( cols = $(tput cols) / 3 ))
+    local cols line
-
+    cols="$(($(tput cols) / 3))"
-    while [[ ${#separator} -le "$cols" ]]; do
+    while [ "${#line}" -lt "$cols" ]; do
-        separator+="$char"
+        line="${line}${1}"
     done
-
+    printf %s "$line"
-    printf '\n%s\n\t%s\n%s\n' "$separator" "$name" "$separator"
 }
 
-# Loop
+# Fonction pour afficher un séparateur
-for pm in "${commands_d}/"*; do
+separator() {
-    separator "$(basename "$pm")"
+    local line
-    # shellcheck source=/dev/null
+    line="$(makeline '=')"
-    source "$pm"
+    printf '\n%s\n\t%s\n%s\n' "$line" "$*" "$line"
+}
+
+# Procédure principale
+for i in ./commands.d/*; do
+    separator "$(basename "$i")"
+    "$i"
 done
 

config/hypr/hyprland.conf

@@ -85,6 +85,9 @@ device:epic mouse V1 {
     sensitivity = -0.5
 }
 
+# Variables
+$browser = librewolf
+
 # Modular sourcing
 $confDir = ~/.config/hypr/hyprland.conf.d
 source = $confDir/bindings.conf

config/hypr/hyprland.conf.d/bindings.conf

@@ -74,7 +74,7 @@ bind = SHIFT ALT, Print, exec, glurp area file
 # Launchers
 bind = $mainMod, D, exec, rofi -show drun
 bind = $mainMod, 36, exec, kitty
-bind = $mainMod, F1, exec, sensible-browser
+bind = $mainMod, F1, exec, $browser
 bind = $mainMod, F2, exec, joplin-desktop
 bind = $mainMod, F3, exec, webcord
 bind = $mainMod ALT, L, exec, swaylock

config/nvim-arch/init.vim

@@ -1,184 +0,0 @@
-" Source the default Vim configuration
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath = &runtimepath
-source ~/.vimrc
-
-" colorscheme
-colorscheme tokyonight-night
-
-" devicons
-let g:webdevicons_enable = 1
-let g:webdevicons_enable_nerdtree = 1
-let g:airline_powerline_fonts = 1
-
-" nerdtree
-nmap <F2> :NERDTreeToggle<CR>
-autocmd VimEnter * NERDTreeFocus | wincmd p
-autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
-autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
-autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif
-
-" coc
-packadd coc.nvim
-
-" May need for Vim (not Neovim) since coc.nvim calculates byte offset by count
-" utf-8 byte sequence
-set encoding=utf-8
-" Some servers have issues with backup files, see #649
-set nobackup
-set nowritebackup
-
-" Having longer updatetime (default is 4000 ms = 4s) leads to noticeable
-" delays and poor user experience
-set updatetime=300
-
-" Always show the signcolumn, otherwise it would shift the text each time
-" diagnostics appear/become resolved
-set signcolumn=yes
-
-" Use tab for trigger completion with characters ahead and navigate
-" NOTE: There's always complete item selected by default, you may want to enable
-" no select by `"suggest.noselect": true` in your configuration file
-" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
-" other plugin before putting this into your config
-inoremap <silent><expr> <TAB>
-      \ coc#pum#visible() ? coc#pum#next(1) :
-      \ CheckBackspace() ? "\<Tab>" :
-      \ coc#refresh()
-inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
-
-" Make <CR> to accept selected completion item or notify coc.nvim to format
-" <C-g>u breaks current undo, please make your own choice
-inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
-                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
-
-function! CheckBackspace() abort
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~# '\s'
-endfunction
-
-" Use <c-space> to trigger completion
-if has('nvim')
-  inoremap <silent><expr> <c-space> coc#refresh()
-else
-  inoremap <silent><expr> <c-@> coc#refresh()
-endif
-
-" Use `[g` and `]g` to navigate diagnostics
-" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list
-nmap <silent> [g <Plug>(coc-diagnostic-prev)
-nmap <silent> ]g <Plug>(coc-diagnostic-next)
-
-" GoTo code navigation
-nmap <silent> gd <Plug>(coc-definition)
-nmap <silent> gy <Plug>(coc-type-definition)
-nmap <silent> gi <Plug>(coc-implementation)
-nmap <silent> gr <Plug>(coc-references)
-
-" Use K to show documentation in preview window
-nnoremap <silent> K :call ShowDocumentation()<CR>
-
-function! ShowDocumentation()
-  if CocAction('hasProvider', 'hover')
-    call CocActionAsync('doHover')
-  else
-    call feedkeys('K', 'in')
-  endif
-endfunction
-
-" Highlight the symbol and its references when holding the cursor
-autocmd CursorHold * silent call CocActionAsync('highlight')
-
-" Symbol renaming
-nmap <leader>rn <Plug>(coc-rename)
-
-" Formatting selected code
-xmap <leader>f  <Plug>(coc-format-selected)
-nmap <leader>f  <Plug>(coc-format-selected)
-
-augroup mygroup
-  autocmd!
-  " Setup formatexpr specified filetype(s)
-  autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
-  " Update signature help on jump placeholder
-  autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
-augroup end
-
-" Applying code actions to the selected code block
-" Example: `<leader>aap` for current paragraph
-xmap <leader>a  <Plug>(coc-codeaction-selected)
-nmap <leader>a  <Plug>(coc-codeaction-selected)
-
-" Remap keys for applying code actions at the cursor position
-nmap <leader>ac  <Plug>(coc-codeaction-cursor)
-" Remap keys for apply code actions affect whole buffer
-nmap <leader>as  <Plug>(coc-codeaction-source)
-" Apply the most preferred quickfix action to fix diagnostic on the current line
-nmap <leader>qf  <Plug>(coc-fix-current)
-
-" Remap keys for applying refactor code actions
-nmap <silent> <leader>re <Plug>(coc-codeaction-refactor)
-xmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
-nmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
-
-" Run the Code Lens action on the current line
-nmap <leader>cl  <Plug>(coc-codelens-action)
-
-" Map function and class text objects
-" NOTE: Requires 'textDocument.documentSymbol' support from the language server
-xmap if <Plug>(coc-funcobj-i)
-omap if <Plug>(coc-funcobj-i)
-xmap af <Plug>(coc-funcobj-a)
-omap af <Plug>(coc-funcobj-a)
-xmap ic <Plug>(coc-classobj-i)
-omap ic <Plug>(coc-classobj-i)
-xmap ac <Plug>(coc-classobj-a)
-omap ac <Plug>(coc-classobj-a)
-
-" Remap <C-f> and <C-b> to scroll float windows/popups
-if has('nvim-0.4.0') || has('patch-8.2.0750')
-  nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
-  nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
-  inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
-  inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
-  vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
-  vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
-endif
-
-" Use CTRL-S for selections ranges
-" Requires 'textDocument/selectionRange' support of language server
-nmap <silent> <C-s> <Plug>(coc-range-select)
-xmap <silent> <C-s> <Plug>(coc-range-select)
-
-" Add `:Format` command to format current buffer
-command! -nargs=0 Format :call CocActionAsync('format')
-
-" Add `:Fold` command to fold current buffer
-command! -nargs=? Fold :call     CocAction('fold', <f-args>)
-
-" Add `:OR` command for organize imports of the current buffer
-command! -nargs=0 OR   :call     CocActionAsync('runCommand', 'editor.action.organizeImport')
-
-" Add (Neo)Vim's native statusline support
-" NOTE: Please see `:h coc-status` for integrations with external plugins that
-" provide custom statusline: lightline.vim, vim-airline
-set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
-
-" Mappings for CoCList
-" Show all diagnostics
-nnoremap <silent><nowait> <space>a  :<C-u>CocList diagnostics<cr>
-" Manage extensions
-nnoremap <silent><nowait> <space>e  :<C-u>CocList extensions<cr>
-" Show commands
-nnoremap <silent><nowait> <space>c  :<C-u>CocList commands<cr>
-" Find symbol of current document
-nnoremap <silent><nowait> <space>o  :<C-u>CocList outline<cr>
-" Search workspace symbols
-nnoremap <silent><nowait> <space>s  :<C-u>CocList -I symbols<cr>
-" Do default action for next item
-nnoremap <silent><nowait> <space>j  :<C-u>CocNext<CR>
-" Do default action for previous item
-nnoremap <silent><nowait> <space>k  :<C-u>CocPrev<CR>
-" Resume latest coc list
-nnoremap <silent><nowait> <space>p  :<C-u>CocListResume<CR>
-

config/nvim/init.lua

@@ -0,0 +1,9 @@
+-- Inclure la configuration par défaut de Vim
+vim.cmd [[ source ~/.vimrc ]]
+
+-- Modules
+require('core.keymaps')
+require('core.plugins')
+require('core.style')
+require('core.plugin_config')
+

config/nvim/lua/core/keymaps.lua

@@ -0,0 +1,7 @@
+-- Map leaders
+vim.g.mapleader = ','
+vim.g.maplocalleader = ','
+
+-- Keymaps
+vim.keymap.set('n', '<leader>h', ':nohlsearch<CR>')
+

config/nvim/lua/core/plugin_config/catppuccin.lua

@@ -0,0 +1,6 @@
+-- Activer les couleurs du terminal
+vim.o.termguicolors = true
+
+-- Changer la palette de couleurs
+vim.cmd [[ colorscheme catppuccin ]]
+

config/nvim/lua/core/plugin_config/init.lua

@@ -0,0 +1,4 @@
+require("core.plugin_config.lualine")
+require("core.plugin_config.nvim-tree")
+require("core.plugin_config.catppuccin")
+

config/nvim/lua/core/plugin_config/lualine.lua

@@ -0,0 +1,15 @@
+require('lualine').setup {
+    options = {
+        icons_enabled = true,
+        theme = 'dracula',
+    },
+    sections = {
+        lualine_a = {
+            {
+                'filename',
+                path = 1,
+            }
+        }
+    }
+}
+

config/nvim/lua/core/plugin_config/nvim-tree.lua

@@ -0,0 +1,7 @@
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+require("nvim-tree").setup()
+
+vim.keymap.set('n', '<F2>', ':NvimTreeFindFileToggle<CR>')
+

config/nvim/lua/core/plugins.lua

@@ -0,0 +1,37 @@
+local ensure_packer = function()
+    local fn = vim.fn
+    local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+    if fn.empty(fn.glob(install_path)) > 0 then
+        fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+        vim.cmd [[packadd packer.nvim]]
+        return true
+    end
+    return false
+end
+
+local packer_bootstrap = ensure_packer()
+
+return require('packer').startup(function(use)
+    use 'wbthomason/packer.nvim'
+    use { "catppuccin/nvim", as = "catppuccin" }
+    use {
+        'nvim-tree/nvim-tree.lua',
+        requires = {
+            'nvim-tree/nvim-web-devicons',
+        },
+        config = function()
+            require("nvim-tree").setup {}
+        end
+    }
+    use {
+        'nvim-lualine/lualine.nvim',
+        requires = { 'nvim-tree/nvim-web-devicons', opt = true }
+    }
+    -- use 'feline-nvim/feline.nvim'
+
+    -- Synchroniser les paquetages si c'est la première exécution
+    if packer_bootstrap then
+        require('packer').sync()
+    end
+end)
+

config/nvim/lua/core/style.lua

@@ -0,0 +1,6 @@
+-- Activer les couleurs du terminal
+vim.o.termguicolors = true
+
+-- Changer la palette de couleurs
+vim.cmd [[ colorscheme catppuccin ]]
+

etc/bash/bashrc.d/ahurac-ahrc-laptop.bashrc

@@ -0,0 +1,19 @@
+# Lines added by ahurac
+
+# PS1
+if [ "$(id -u)" -eq 0 ]; then
+	ps1_color_1=1
+	ps1_color_2=10
+else
+	ps1_color_1=2
+	ps1_color_2=4
+fi
+export PS1="(\[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_1}m\]\u@\h\[$(tput sgr0)\] \[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_2}m\]\W\[$(tput sgr0)\])\\$ \[$(tput sgr0)\]"
+
+shrc_d=/usr/local/etc/sh/shrc.d
+if [ -d "$shrc_d" ]; then
+    for i in "${shrc_d}/"*; do
+        . "$i"
+    done
+fi
+

etc/bash/bashrc.d/ahurac-ahrc-pc.bashrc

@@ -0,0 +1,19 @@
+# Lines added by ahurac
+
+# PS1
+if [ "$(id -u)" -eq 0 ]; then
+	ps1_color_1=1
+	ps1_color_2=10
+else
+	ps1_color_1=5
+	ps1_color_2=4
+fi
+export PS1="[\[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_1}m\]\u@\h\[$(tput sgr0)\] \[$(tput sgr0)\]\[$(tput bold)\]\[\033[38;5;${ps1_color_2}m\]\W\[$(tput sgr0)\]]\\$ \[$(tput sgr0)\]"
+
+shrc_d=/usr/local/etc/sh/shrc.d
+if [ -d "$shrc_d" ]; then
+    for i in "${shrc_d}/"*; do
+        . "$i"
+    done
+fi
+

etc/sh/shrc.d/aliases.bashrc

@@ -0,0 +1,24 @@
+# coreutils
+alias ls="ls --color=auto"
+alias lsa="ls -A"
+alias l="ls -l"
+alias la="l -A"
+alias isodate="date +'%Y_%m_%d'"
+
+# bash
+alias t="type -a"
+alias j=jobs
+alias pd=pushd
+
+# neovim
+alias nv=nvim
+
+# procps-ng
+alias pg="pgrep -ai"
+
+# iproute2
+alias ip="ip --color=auto"
+
+# util-linux
+alias cal="cal -m"
+

etc/sh/shrc.d/functions.bashrc

@@ -0,0 +1,5 @@
+# coreutils
+mkcdir() {
+	mkdir -p "$1" && cd "$_"
+}
+

etc/zsh/zshrc

@@ -0,0 +1,10 @@
+sourcefiles() {
+    if [ -d "$1" ]; then
+        for i in "${1}/"*; do
+            . "$i"
+        done
+    fi
+}
+
+sourcefiles /usr/local/etc/sh/shrc.d
+

home/shrc.d/aliases

@@ -0,0 +1,13 @@
+# sudo
+alias s="sudo"
+
+# wine
+alias wine32="WINEPREFIX=~/.wine32 wine"
+
+# kitty
+if [ "$TERM" = xterm-kitty ]; then
+    alias ssh="kitty +kitten ssh"
+else
+    alias sshm="ssh -M"
+fi
+

home/shrc.d/functions

@@ -0,0 +1,11 @@
+# curl
+function reveal-url {
+    curl "$1" -IL --silent | grep 'location: '
+}
+
+# zsh
+command_not_found_handler() {
+    >&2 echo "bruh wtf is \"${1}\" o_O"
+    return 127
+}
+

home/zprofile

@@ -0,0 +1,24 @@
+# Lines added by ahurac
+
+# Prepenth the local bin directory to the path array
+typeset -U path PATH
+
+addpath() {
+    if [ -d "$1" ]; then
+        path=("$1" $path)
+    fi
+}
+
+addpath ~/.local/bin
+addpath ~/.local/share/minecraft/servers/bin
+
+# Fastfetch
+fastfetch
+
+# Start Hyprland if the tty is 1
+if [ "$(tty)" = /dev/tty1 ]; then
+    exec Hyprland
+else
+    true
+fi
+

home/zshenv

@@ -0,0 +1,2 @@
+export EDITOR=nvim
+

home/zshrc

@@ -0,0 +1,93 @@
+# Lines configured by zsh-newuser-install
+HISTFILE=~/.histfile
+HISTSIZE=1000
+SAVEHIST=1000
+setopt autocd extendedglob nomatch
+unsetopt beep notify
+# End of lines configured by zsh-newuser-install
+# The following lines were added by compinstall
+zstyle :compinstall filename '/home/ahurac/.zshrc'
+
+autoload -Uz compinit
+compinit
+# End of lines added by compinstall
+
+# Bindings
+# create a zkbd compatible hash;
+# to add other keys to this hash, see: man 5 terminfo
+typeset -g -A key
+
+autoload -Uz up-line-or-beginning-search down-line-or-beginning-search
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search
+
+key[Home]="${terminfo[khome]}"
+key[End]="${terminfo[kend]}"
+key[Insert]="${terminfo[kich1]}"
+key[Backspace]="${terminfo[kbs]}"
+key[Delete]="${terminfo[kdch1]}"
+key[Up]="${terminfo[kcuu1]}"
+key[Down]="${terminfo[kcud1]}"
+key[Left]="${terminfo[kcub1]}"
+key[Right]="${terminfo[kcuf1]}"
+key[PageUp]="${terminfo[kpp]}"
+key[PageDown]="${terminfo[knp]}"
+key[Shift-Tab]="${terminfo[kcbt]}"
+key[Control-Left]="^[[1;5D"
+key[Control-Right]="^[[1;5C"
+
+# setup key accordingly
+[[ -n "${key[Home]}"       ]] && bindkey -- "${key[Home]}"       beginning-of-line
+[[ -n "${key[End]}"        ]] && bindkey -- "${key[End]}"        end-of-line
+[[ -n "${key[Insert]}"     ]] && bindkey -- "${key[Insert]}"     overwrite-mode
+[[ -n "${key[Backspace]}"  ]] && bindkey -- "${key[Backspace]}"  backward-delete-char
+[[ -n "${key[Delete]}"     ]] && bindkey -- "${key[Delete]}"     delete-char
+[[ -n "${key[Up]}"   ]] && bindkey -- "${key[Up]}"   up-line-or-beginning-search
+[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search
+[[ -n "${key[Left]}"       ]] && bindkey -- "${key[Left]}"       backward-char
+[[ -n "${key[Right]}"      ]] && bindkey -- "${key[Right]}"      forward-char
+[[ -n "${key[PageUp]}"     ]] && bindkey -- "${key[PageUp]}"     beginning-of-buffer-or-history
+[[ -n "${key[PageDown]}"   ]] && bindkey -- "${key[PageDown]}"   end-of-buffer-or-history
+[[ -n "${key[Shift-Tab]}"  ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
+[[ -n "${key[Control-Left]}"  ]] && bindkey -- "${key[Control-Left]}"  backward-word
+[[ -n "${key[Control-Right]}" ]] && bindkey -- "${key[Control-Right]}" forward-word
+
+# Finally, make sure the terminal is in application mode, when zle is
+# active. Only then are the values from $terminfo valid.
+if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
+    autoload -Uz add-zle-hook-widget
+    function zle_application_mode_start { echoti smkx }
+    function zle_application_mode_stop { echoti rmkx }
+    add-zle-hook-widget -Uz zle-line-init zle_application_mode_start
+    add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop
+fi
+
+# Custom the prompt
+autoload colors && colors
+PROMPT=$'╭─[%F{magenta}%B%n@%m%f%b]──[%F{blue}%B%5~%b%f]──[%B%?%b]\n╰─[%# '
+
+# Completion even with sudo
+zstyle ':completion::complete:*' gain-privileges 1
+
+# Source more definitions
+zshrc_d="$HOME/.zshrc.d"
+[[ -d $zshrc_d ]] && for rc in "${zshrc_d}/"*; do
+source "$rc"
+done
+unset zshrc_d
+
+# Disable the vi-mode
+bindkey -e
+
+# Disable the autopushd feature
+unsetopt autopushd
+
+# Set the umask
+#umask 077
+
+# Case sensitive
+CASE_SENSITIVE="true"
+
+# zsh-vi-mode
+source /usr/share/zsh/plugins/zsh-vi-mode/zsh-vi-mode.plugin.zsh
+

share/updateall/commands.d/apt

@@ -1,3 +1,4 @@
+#!/bin/sh
 sudo apt-get update
 sudo apt-get upgrade
 sudo apt-get autoremove

share/updateall/commands.d/docker

@@ -1,3 +1,3 @@
+#!/bin/sh
 sudo docker images --format '{{.Repository}}' | xargs -L 1 sudo docker pull
-sudo docker image prune
 

share/updateall/commands.d/git

@@ -1,9 +1,13 @@
-if pushd ~/Git; then
+#!/bin/sh
+if cd "${1:-~/Git}"; then
     for repo in *; do
-        pushd "$repo"
+        cd "$repo"
         git pull
-        popd
+        cd ..
     done
-    popd
+elif [ -z "$1" ]; then
+    exec "$0" ~/git
+else
+    >&2 echo "Can't find your git folder!"
 fi
 

share/updateall/commands.d/yay

@@ -1,2 +1,3 @@
+#!/bin/sh
 yay -Fy
 yay