From 80f23f019b5a62c24fc3dd63b64614badca3032a Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 17 Jul 2021 13:31:47 +0200
Subject: [PATCH] neovim: Reorganise directory layout

This also loads UltiSnips by setting a configuration option instead of
symlinking it to the default location.
---
 users/simon/modules/default.nix                              | 2 +-
 .../{files/nvim => modules/neovim}/UltiSnips/nix.snippets    | 0
 .../{files/nvim => modules/neovim}/UltiSnips/rust.snippets   | 0
 .../{files/nvim => modules/neovim}/UltiSnips/tex.snippets    | 0
 .../nvim => modules/neovim}/UltiSnips/texmath.snippets       | 0
 users/simon/modules/{neovim.nix => neovim/default.nix}       | 5 +----
 6 files changed, 2 insertions(+), 5 deletions(-)
 rename users/simon/{files/nvim => modules/neovim}/UltiSnips/nix.snippets (100%)
 rename users/simon/{files/nvim => modules/neovim}/UltiSnips/rust.snippets (100%)
 rename users/simon/{files/nvim => modules/neovim}/UltiSnips/tex.snippets (100%)
 rename users/simon/{files/nvim => modules/neovim}/UltiSnips/texmath.snippets (100%)
 rename users/simon/modules/{neovim.nix => neovim/default.nix} (99%)

diff --git a/users/simon/modules/default.nix b/users/simon/modules/default.nix
index 0a46975..b19fd06 100644
--- a/users/simon/modules/default.nix
+++ b/users/simon/modules/default.nix
@@ -10,7 +10,7 @@
     ./misc.nix
     ./mpd.nix
     ./mpv
-    ./neovim.nix
+    ./neovim
     ./pass.nix
     ./programs.nix
     ./scripts.nix
diff --git a/users/simon/files/nvim/UltiSnips/nix.snippets b/users/simon/modules/neovim/UltiSnips/nix.snippets
similarity index 100%
rename from users/simon/files/nvim/UltiSnips/nix.snippets
rename to users/simon/modules/neovim/UltiSnips/nix.snippets
diff --git a/users/simon/files/nvim/UltiSnips/rust.snippets b/users/simon/modules/neovim/UltiSnips/rust.snippets
similarity index 100%
rename from users/simon/files/nvim/UltiSnips/rust.snippets
rename to users/simon/modules/neovim/UltiSnips/rust.snippets
diff --git a/users/simon/files/nvim/UltiSnips/tex.snippets b/users/simon/modules/neovim/UltiSnips/tex.snippets
similarity index 100%
rename from users/simon/files/nvim/UltiSnips/tex.snippets
rename to users/simon/modules/neovim/UltiSnips/tex.snippets
diff --git a/users/simon/files/nvim/UltiSnips/texmath.snippets b/users/simon/modules/neovim/UltiSnips/texmath.snippets
similarity index 100%
rename from users/simon/files/nvim/UltiSnips/texmath.snippets
rename to users/simon/modules/neovim/UltiSnips/texmath.snippets
diff --git a/users/simon/modules/neovim.nix b/users/simon/modules/neovim/default.nix
similarity index 99%
rename from users/simon/modules/neovim.nix
rename to users/simon/modules/neovim/default.nix
index dcc71e1..70e1abf 100644
--- a/users/simon/modules/neovim.nix
+++ b/users/simon/modules/neovim/default.nix
@@ -211,6 +211,7 @@ in
       {
         plugin = ultisnips;
         config = ''
+          let g:UltiSnipsSnippetDirectories = [ '${./UltiSnips}' ]
           let g:UltiSnipsExpandTrigger = '<tab>'
           let g:UltiSnipsJumpForwardTrigger = '<tab>'
           let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
@@ -302,10 +303,6 @@ in
     ];
   };
 
-  xdg.configFile = {
-    "nvim/UltiSnips".source = ../files/nvim/UltiSnips;
-  };
-
   home.sessionVariables.EDITOR = "nvim";
 
   home.packages = with pkgs; [