From 923f41e700c1ad9f22f36a8c666af606c85d2dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Tue, 4 Jan 2022 13:40:39 +0100
Subject: [PATCH] Fix merge issue

---
 modules/terminal-life/nvim/default.nix | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix
index 7580bda2..fbfb8f94 100644
--- a/modules/terminal-life/nvim/default.nix
+++ b/modules/terminal-life/nvim/default.nix
@@ -166,26 +166,4 @@ in
           \ call fzf#vim#files(<q-args>, { 'options': ['--keep-right', '--cycle', '--layout', 'reverse', '--preview', '${preview-file}/bin/preview-file {}'] }, <bang>0)
     ''
   ];
-
-  extraConfig = builtins.concatStringsSep "\n" [
-    ''
-      " Persistent undo
-      set undofile
-      set undodir=${xdg.cacheHome}/nvim/undo
-
-      set backupdir=${xdg.dataHome}/nvim/backup
-      set directory=${xdg.dataHome}/nvim/swap/
-    ''
-    (builtins.readFile ./init.vim)
-    (builtins.readFile ./plugins.vim)
-    (builtins.readFile ./clipboard.vim)
-    (builtins.readFile ./ui.vim)
-    (builtins.readFile ./quickfixopenall.vim)
-    (builtins.readFile ./lsp.vim)
-    ''
-      " fzf with file preview
-      command! -bang -nargs=? -complete=dir Files
-          \ call fzf#vim#files(<q-args>, { 'options': ['--keep-right', '--cycle', '--layout', 'reverse', '--preview', '${preview-file}/bin/preview-file {}'] }, <bang>0)
-    ''
-  ];
 }