diff --git a/.config/mimeapps.list b/.config/mimeapps.list index 47b6f8c..4eb4106 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -22,6 +22,7 @@ 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 f21830c..808cf24 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -2,7 +2,5 @@ [ ! -d "$HISTFILE_DIR" ] && mkdir -p "$HISTFILE_DIR" [ ! -d "$COMPDIR" ] && mkdir -p "$COMPDIR" -# transmission -if hash transmission-daemon 2>/dev/null; then - transmission-daemon -fi +hash transmission-daemon 2>/dev/null && transmission-daemon +hash kitty 2>/dev/null && export TERMINAL="kitty" diff --git a/.gitconfig b/.gitconfig index 2545329..9857f52 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] name = Rodolphe Bréard - email = rodolphe@what.tf + email = v.code.ngyvz7vf@what.tf SigningKey = B229CCD5690091E7D5D6189F09BC23A1D5562635 [core] diff --git a/.gitignore b/.gitignore index 0c1f41e..9230d78 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,7 @@ __pycache__/ *$py.class # Vim -.vim/bundle/* -!.vim/bundle/Vundle.vim +.vim/plugged/* .vim/.netrwhist *.swp diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9eb7fea..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[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 deleted file mode 160000 index b255382..0000000 --- a/.vim/bundle/Vundle.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95 diff --git a/.vim/ftplugin/c.vim b/.vim/indent/c.vim similarity index 100% rename from .vim/ftplugin/c.vim rename to .vim/indent/c.vim diff --git a/.vim/ftplugin/cpp.vim b/.vim/indent/cpp.vim similarity index 100% rename from .vim/ftplugin/cpp.vim rename to .vim/indent/cpp.vim diff --git a/.vim/ftplugin/html.vim b/.vim/indent/html.vim similarity index 100% rename from .vim/ftplugin/html.vim rename to .vim/indent/html.vim diff --git a/.vim/ftplugin/python.vim b/.vim/indent/javascript.vim similarity index 100% rename from .vim/ftplugin/python.vim rename to .vim/indent/javascript.vim diff --git a/.vim/ftplugin/rust.vim b/.vim/indent/python.vim similarity index 100% rename from .vim/ftplugin/rust.vim rename to .vim/indent/python.vim diff --git a/.vim/ftplugin/sh.vim b/.vim/indent/rust.vim similarity index 100% rename from .vim/ftplugin/sh.vim rename to .vim/indent/rust.vim diff --git a/.vim/ftplugin/sql.vim b/.vim/indent/sh.vim similarity index 100% rename from .vim/ftplugin/sql.vim rename to .vim/indent/sh.vim diff --git a/.vim/indent/sql.vim b/.vim/indent/sql.vim new file mode 100644 index 0000000..891c9bb --- /dev/null +++ b/.vim/indent/sql.vim @@ -0,0 +1 @@ +set expandtab& diff --git a/.vim/indent/vue.vim b/.vim/indent/vue.vim new file mode 100644 index 0000000..891c9bb --- /dev/null +++ b/.vim/indent/vue.vim @@ -0,0 +1 @@ +set expandtab& diff --git a/.vimrc b/.vimrc index b84a6c3..d51a502 100644 --- a/.vimrc +++ b/.vimrc @@ -1,25 +1,19 @@ set nocompatible filetype off -" Install Vundle: -" $ git clone https://github.com/VundleVim/Vundle.vim.git \ -" ~/.vim/bundle/Vundle.vim -" " Install all plugins: -" $ vim +PluginInstall +qall +" $ vim +PlugInstall -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() +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() syntax on " Enable syntax highlighting. @@ -73,8 +67,9 @@ let g:licenses_default_commands = ['affero', 'apache', 'bsd3', 'cecill', 'gfdl', :augroup END -" Vertical indentation lines +" indentLine let g:indentLine_char = '⦙' +let g:indentLine_setConceal = 0 " Tera templates diff --git a/README.md b/README.md index 4b9e945..3a56d37 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ pacman -S dosfstools mtools ``` sh # Base utils -yay -S liquidprompt +yay -S liquidprompt vim-plug # Printer yay -S brother-dcp1610w brscan-skey brscan4 # Graphical software @@ -39,25 +39,10 @@ yay -S cardpeek ## vim -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. +Plugins are managed by `vim-plug`, which is installed from the AUR. ``` sh -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' +vim +PlugInstall ```