From 93b858a882b79b96d0a745b5c6aa9365b94fb658 Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <kontakt@webgefrickel.de>
Date: Mon, 7 Jun 2021 12:57:44 +0200
Subject: [PATCH] Updates, bufferline

---
 etc/php/7.4/conf.d/imagick.ini |  2 +-
 install/1_languages.sh         |  4 ++--
 install/2_cli-tools.sh         |  2 +-
 nvim/init.vim                  | 13 ++++++++-----
 nvim/plugins.vim               | 19 ++++++++++++++++++-
 tmux.conf                      |  1 +
 6 files changed, 31 insertions(+), 10 deletions(-)

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 <<EOF
-require'nvim-treesitter.configs'.setup {
+require('nvim-treesitter.configs').setup {
   highlight = {
     enable = true
   },
@@ -10,6 +10,23 @@ require'nvim-treesitter.configs'.setup {
 }
 EOF
 
+" bufferline
+lua <<EOF
+require('bufferline').setup {
+  options = {
+    numbers = "ordinal",
+    mappings = true,
+    separator_style = "thin",
+    always_show_bufferline = false,
+    show_close_icon = false
+  }
+}
+EOF
+
+nnoremap <silent> <leader>, :BufferLinePick<cr>
+nnoremap <silent> <leader>] :BufferLineCycleNext<CR>
+nnoremap <silent> <leader>[ :BufferLineCyclePrev<CR>
+
 " fugitive
 nnoremap <silent> <leader>gs :G<cr><C-w>20+
 nnoremap <silent> <leader>gd :Gvdiff<cr><C-w>20+
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'