diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index afa4805..a09ae7d 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -27,7 +27,6 @@
     fzf
     gh
     git
-    git-crypt
     gitui
     gnupg
     jq
@@ -54,7 +53,6 @@
     dotnet-sdk
     go
     jdk
-    nil
     nodejs-19_x
     ruby_3_1
     shards
diff --git a/nvim/plugin/barbar.lua b/nvim/plugin/barbar.lua
deleted file mode 100644
index cbaa758..0000000
--- a/nvim/plugin/barbar.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-local ok, barbar = pcall(require, 'barbar')
-if not ok then return end;
-
-barbar.setup {
-  icons = {
-    buffer_index = true,
-    filetype = {
-      enabled = true
-    }
-  }
-}
-
-local map = vim.api.nvim_set_keymap
-local opts = { noremap = true, silent = true }
-
--- Navigating buffers
-map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
-map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
-map('n', '<A-s>', '<Cmd>BufferPick<CR>', opts)
-map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
diff --git a/nvim/plugin/barbar.vim b/nvim/plugin/barbar.vim
new file mode 100644
index 0000000..e3e632b
--- /dev/null
+++ b/nvim/plugin/barbar.vim
@@ -0,0 +1,9 @@
+let bufferline = get(g:, 'bufferline', {})
+let bufferline.icons = 'both'
+
+" Navigating buffers
+nnoremap <silent> <A-,> :BufferPrevious<CR>
+nnoremap <silent> <A-.> :BufferNext<CR>
+nnoremap <silent> <A-s> :BufferPick<CR>
+
+nnoremap <silent> <A-c> :BufferClose<CR>