diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 4eb4106..47b6f8c 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -22,7 +22,6 @@ video/quicktime=mpv.desktop;vlc.desktop video/webm=mpv.desktop;vlc.desktop video/x-flv=mpv.desktop;vlc.desktop video/x-matroska=mpv.desktop;vlc.desktop -video/x-ms-asf=mpv.desktop;vlc.desktop video/x-msvideo=mpv.desktop;vlc.desktop application/x-extension-htm=firefox.desktop diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 808cf24..f21830c 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -2,5 +2,7 @@ [ ! -d "$HISTFILE_DIR" ] && mkdir -p "$HISTFILE_DIR" [ ! -d "$COMPDIR" ] && mkdir -p "$COMPDIR" -hash transmission-daemon 2>/dev/null && transmission-daemon -hash kitty 2>/dev/null && export TERMINAL="kitty" +# transmission +if hash transmission-daemon 2>/dev/null; then + transmission-daemon +fi diff --git a/.gitconfig b/.gitconfig index 9857f52..2545329 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] name = Rodolphe Bréard - email = v.code.ngyvz7vf@what.tf + email = rodolphe@what.tf SigningKey = B229CCD5690091E7D5D6189F09BC23A1D5562635 [core] diff --git a/.gitignore b/.gitignore index 9230d78..0c1f41e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,8 @@ __pycache__/ *$py.class # Vim -.vim/plugged/* +.vim/bundle/* +!.vim/bundle/Vundle.vim .vim/.netrwhist *.swp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..9eb7fea --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".vim/bundle/Vundle.vim"] + path = .vim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim new file mode 160000 index 0000000..b255382 --- /dev/null +++ b/.vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95 diff --git a/.vim/indent/c.vim b/.vim/ftplugin/c.vim similarity index 100% rename from .vim/indent/c.vim rename to .vim/ftplugin/c.vim diff --git a/.vim/indent/cpp.vim b/.vim/ftplugin/cpp.vim similarity index 100% rename from .vim/indent/cpp.vim rename to .vim/ftplugin/cpp.vim diff --git a/.vim/indent/html.vim b/.vim/ftplugin/html.vim similarity index 100% rename from .vim/indent/html.vim rename to .vim/ftplugin/html.vim diff --git a/.vim/indent/python.vim b/.vim/ftplugin/python.vim similarity index 100% rename from .vim/indent/python.vim rename to .vim/ftplugin/python.vim diff --git a/.vim/indent/rust.vim b/.vim/ftplugin/rust.vim similarity index 100% rename from .vim/indent/rust.vim rename to .vim/ftplugin/rust.vim diff --git a/.vim/indent/sh.vim b/.vim/ftplugin/sh.vim similarity index 100% rename from .vim/indent/sh.vim rename to .vim/ftplugin/sh.vim diff --git a/.vim/indent/sql.vim b/.vim/ftplugin/sql.vim similarity index 100% rename from .vim/indent/sql.vim rename to .vim/ftplugin/sql.vim diff --git a/.vim/indent/javascript.vim b/.vim/indent/javascript.vim deleted file mode 100644 index 891c9bb..0000000 --- a/.vim/indent/javascript.vim +++ /dev/null @@ -1 +0,0 @@ -set expandtab& diff --git a/.vim/indent/vue.vim b/.vim/indent/vue.vim deleted file mode 100644 index 891c9bb..0000000 --- a/.vim/indent/vue.vim +++ /dev/null @@ -1 +0,0 @@ -set expandtab& diff --git a/.vimrc b/.vimrc index d51a502..b84a6c3 100644 --- a/.vimrc +++ b/.vimrc @@ -1,19 +1,25 @@ set nocompatible filetype off +" Install Vundle: +" $ git clone https://github.com/VundleVim/Vundle.vim.git \ +" ~/.vim/bundle/Vundle.vim +" " Install all plugins: -" $ vim +PlugInstall +" $ vim +PluginInstall +qall -call plug#begin('~/.vim/plugged') -Plug 'bling/vim-airline' " Lean & mean status/tabline for vim that's light as air. -Plug 'antoyo/vim-licenses' " Vim Plugin that Provides Commands to Add Licenses at the Top of the Buffer. -Plug 'sjl/badwolf' " A Vim color scheme. -Plug 'rust-lang/rust.vim' " Vim configuration for Rust. -Plug 'cespare/vim-toml' " Vim syntax for TOML. -Plug 'editorconfig/editorconfig-vim' " EditorConfig plugin -Plug 'Yggdroot/indentLine' " Display thin vertical lines at each indentation level -Plug 'leafOfTree/vim-vue-plugin' " Vim syntax and indent plugin for .vue files. -call plug#end() +set rtp+=~/.vim/bundle/Vundle.vim " Set the runtime path to include Vundle and initialize. +call vundle#begin() +Plugin 'VundleVim/Vundle.vim' " Let Vundle manage Vundle, required. +Plugin 'bling/vim-airline' " Lean & mean status/tabline for vim that's light as air. +Plugin 'antoyo/vim-licenses' " Vim Plugin that Provides Commands to Add Licenses at the Top of the Buffer. +Plugin 'breard-r/vim-dnsserial' " Another DNS-zone serial number updater. +Plugin 'sjl/badwolf' " A Vim color scheme. +Plugin 'rust-lang/rust.vim' " Vim configuration for Rust. +Plugin 'cespare/vim-toml' " Vim syntax for TOML. +Plugin 'editorconfig/editorconfig-vim' " EditorConfig plugin +Plugin 'Yggdroot/indentLine' " Display thin vertical lines at each indentation level +call vundle#end() syntax on " Enable syntax highlighting. @@ -67,9 +73,8 @@ let g:licenses_default_commands = ['affero', 'apache', 'bsd3', 'cecill', 'gfdl', :augroup END -" indentLine +" Vertical indentation lines let g:indentLine_char = '⦙' -let g:indentLine_setConceal = 0 " Tera templates diff --git a/README.md b/README.md index 3a56d37..4b9e945 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ pacman -S dosfstools mtools ``` sh # Base utils -yay -S liquidprompt vim-plug +yay -S liquidprompt # Printer yay -S brother-dcp1610w brscan-skey brscan4 # Graphical software @@ -39,10 +39,25 @@ yay -S cardpeek ## vim -Plugins are managed by `vim-plug`, which is installed from the AUR. +Plugins are managed by Vundle, which is a git submodule. After cloning the `dotfiles` repository, you have to initialize the submodule and install all plugins. ``` sh -vim +PlugInstall +cd dotfiles/ +git submodule init +git submodule update +vim +PluginInstall +qall +``` + +Plugins can be updated with `vim +PluginUpdate +qall`. + +Updating the Vundle submodule: + +``` sh +cd .vim/bundle/Vundle.vim +git checkout master +git pull +cd - +git commit -m 'Update Vundle' ```