diff --git a/common/packages.nix b/common/packages.nix
index 7670b0c..7eec49d 100644
--- a/common/packages.nix
+++ b/common/packages.nix
@@ -14,6 +14,7 @@ in
         gnupg
         imagemagick
         pfetch
+        pinentry-curses
         tree
         unzip
         xdg_utils
diff --git a/flake.lock b/flake.lock
index 8326be3..6fff9d1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1625598452,
-        "narHash": "sha256-Oqh7nuZfEk+nkspGN5MS5ZTJ3dSxsUudTRvY/iUFad8=",
+        "lastModified": 1625697353,
+        "narHash": "sha256-/v85RkZ0Z+lxipkG2sjYNRINktc8VySbLQmPbirY0hQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "00c86ad14639887ec495b92ada9cd93a75317686",
+        "rev": "87807e64a5ef5206b745a40af118c7be8db73681",
         "type": "github"
       },
       "original": {
diff --git a/home/default.nix b/home/default.nix
index 4ec4ea0..8bc4c25 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -218,7 +218,7 @@ in
     tmux = {
       enable = true;
       clock24 = true;
-      terminal = "screen-256color";
+      terminal = "xterm-256color";
       customPaneNavigationAndResize = true;
       plugins = with pkgs.tmuxPlugins; [
         {
@@ -303,13 +303,10 @@ in
         vim-fugitive
         vim-gitgutter
         vim-go
-        vim-javacomplete2
         vim-javascript
         vim-markdown
         vim-nix
-        vim-pandoc
         vim-prettier
-        vim-pandoc-syntax
         vim-repeat
         vim-sneak
         vim-surround
diff --git a/home/nvim/statusline.vim b/home/nvim/statusline.vim
index 7dac65c..b96fa3b 100644
--- a/home/nvim/statusline.vim
+++ b/home/nvim/statusline.vim
@@ -11,7 +11,6 @@ set statusline=
 set statusline+=%#Pmenu#
 set statusline+=%{StatuslineMode()}
 set statusline+=%#PmenuSel#
-set statusline+=%{StatuslineGit()}
 set statusline+=%#LineNr#
 set statusline+=\ %f
 set statusline+=%m
@@ -49,15 +48,6 @@ function! StatuslineMode()
 
 endfunction
 
-function! GitBranch()
-  return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
-endfunction
-
-function! StatuslineGit()
-  let l:branchname = GitBranch()
-  return strlen(l:branchname) > 0?'   '.l:branchname.' ':''
-endfunction
-
 augroup SetStatusline
     autocmd!
     autocmd BufEnter,WinEnter * call ActivateStatusline()
diff --git a/modules/darwin/preferences.nix b/modules/darwin/preferences.nix
index 005fd76..69b387d 100644
--- a/modules/darwin/preferences.nix
+++ b/modules/darwin/preferences.nix
@@ -45,9 +45,7 @@
       "com.apple.sound.beep.feedback" = 0;
       "com.apple.sound.beep.volume" = "0.000";
       ApplePressAndHoldEnabled = false;
-      # delay before repeating keystrokes
       InitialKeyRepeat = 10;
-      # delay between repeated keystrokes upon holding a key
       KeyRepeat = 2;
       AppleShowAllExtensions = true;
       AppleShowScrollBars = "Automatic";