diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix
index a09ae7d..afa4805 100644
--- a/nix/darwin-configuration.nix
+++ b/nix/darwin-configuration.nix
@@ -27,6 +27,7 @@
     fzf
     gh
     git
+    git-crypt
     gitui
     gnupg
     jq
@@ -53,6 +54,7 @@
     dotnet-sdk
     go
     jdk
+    nil
     nodejs-19_x
     ruby_3_1
     shards
diff --git a/nvim/plugin/barbar.lua b/nvim/plugin/barbar.lua
new file mode 100644
index 0000000..cbaa758
--- /dev/null
+++ b/nvim/plugin/barbar.lua
@@ -0,0 +1,20 @@
+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
deleted file mode 100644
index e3e632b..0000000
--- a/nvim/plugin/barbar.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-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>