diff --git a/etc/php/7.4/conf.d/imagick.ini b/etc/php/7.4/conf.d/imagick.ini index cbb61722..e3439fa2 100644 --- a/etc/php/7.4/conf.d/imagick.ini +++ b/etc/php/7.4/conf.d/imagick.ini @@ -1 +1 @@ -extension="imagick.so" +extension="/usr/local/Cellar/php@7.4/7.4.20/pecl/20190902/imagick.so" diff --git a/install/1_languages.sh b/install/1_languages.sh index 8b4bf859..0f6763b7 100755 --- a/install/1_languages.sh +++ b/install/1_languages.sh @@ -17,6 +17,6 @@ npm update -g # first: find out the current python3 version in homebrew # then install this version with pyenv and link it brew install pyenv # restart terminal, then: -pyenv install 3.9.4 -pyenv global 3.9.4 +pyenv install 3.9.5 +pyenv global 3.9.5 pip install --upgrade pip diff --git a/install/2_cli-tools.sh b/install/2_cli-tools.sh index 08f57332..7a1f481c 100755 --- a/install/2_cli-tools.sh +++ b/install/2_cli-tools.sh @@ -8,7 +8,7 @@ brew tap homebrew/services brew install clipper brew install exa brew install fzf -brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-fdk-aac +brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-fdk-aac --with-rav1e brew install htop brew install jump brew install lazygit diff --git a/nvim/init.vim b/nvim/init.vim index 6320d435..a674bbde 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,9 +1,16 @@ call plug#begin('~/.config/nvim/plugged') +" Some dependencies and colorscheme +Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug 'kyazdani42/nvim-web-devicons' +Plug 'rktjmp/lush.nvim' +Plug 'npxbr/gruvbox.nvim' + +" Plugins +Plug 'akinsho/nvim-bufferline.lua' Plug 'christoomey/vim-tmux-navigator' Plug 'easymotion/vim-easymotion' Plug 'editorconfig/editorconfig-vim' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' Plug 'neoclide/coc.nvim', { 'branch': 'release' } Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} @@ -20,10 +27,6 @@ Plug 'wellle/targets.vim' Plug 'wellle/tmux-complete.vim' Plug 'wincent/terminus' -" colorscheme -Plug 'rktjmp/lush.nvim' -Plug 'npxbr/gruvbox.nvim' - call plug#end() " load the default config and mappings diff --git a/nvim/plugins.vim b/nvim/plugins.vim index df2feabb..52ba00b8 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -1,6 +1,6 @@ " treesitter lua < , :BufferLinePick +nnoremap ] :BufferLineCycleNext +nnoremap [ :BufferLineCyclePrev + " fugitive nnoremap gs :G20+ nnoremap gd :Gvdiff20+ diff --git a/tmux.conf b/tmux.conf index 2781b23a..7bd9ba04 100644 --- a/tmux.conf +++ b/tmux.conf @@ -46,6 +46,7 @@ setw -g clock-mode-colour green # Plugin configuration set -g @resurrect-processes 'l nnn v vim nvim m mutt neomutt' set -g @continuum-restore 'on' +set -g @continuum-boot 'off' # Plugins loading and tmux plugin manager initialization set -g @plugin 'christoomey/vim-tmux-navigator'