From 9e3aa24078c78474f8aa47a3346cac72cfd2a545 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Thu, 2 Sep 2021 05:26:39 +0100
Subject: [PATCH] There is nothing less I want to build for aarch64 than this

---
 config/users/kat/base/default.nix         |  1 -
 config/users/kat/base/vim/default.nix     |  1 -
 config/users/kat/base/vim/init.vim        |  9 ---------
 config/users/kat/dev/default.nix          |  1 +
 config/users/kat/{base => dev}/rink.nix   |  0
 config/users/kat/personal/vim/default.nix | 12 ++++++++++++
 config/users/kat/personal/vim/init.vim    |  8 ++++++++
 7 files changed, 21 insertions(+), 11 deletions(-)
 rename config/users/kat/{base => dev}/rink.nix (100%)
 create mode 100644 config/users/kat/personal/vim/default.nix
 create mode 100644 config/users/kat/personal/vim/init.vim

diff --git a/config/users/kat/base/default.nix b/config/users/kat/base/default.nix
index c7007969..9ec0e8f4 100644
--- a/config/users/kat/base/default.nix
+++ b/config/users/kat/base/default.nix
@@ -12,7 +12,6 @@
     ./packages.nix
     ./weechat.nix
     ./inputrc.nix
-    ./rink.nix
     ./secrets.nix
   ];
 
diff --git a/config/users/kat/base/vim/default.nix b/config/users/kat/base/vim/default.nix
index 83d8aee3..4b09eb38 100644
--- a/config/users/kat/base/vim/default.nix
+++ b/config/users/kat/base/vim/default.nix
@@ -31,7 +31,6 @@ in
       vim-lastplace
       vim-hexokinase
       vim-easymotion
-      notmuch-vim
       vim-nix
       fzf-vim
       vim-fugitive
diff --git a/config/users/kat/base/vim/init.vim b/config/users/kat/base/vim/init.vim
index 7fc9eb5b..0c1690b6 100644
--- a/config/users/kat/base/vim/init.vim
+++ b/config/users/kat/base/vim/init.vim
@@ -21,15 +21,6 @@ let g:airline#extensions#tabline#enabled = 1
 let g:Hexokinase_highlighters = ['virtual']
 let g:Hexokinase_optInPatterns = 'full_hex,rgb,rgba,hsl,hsla,colour_names'
 
-" notmuch!
-let g:notmuch_config_file=$XDG_CONFIG_HOME . '/notmuch/notmuchrc'
-let g:notmuch_folders_count_threads=0
-let g:notmuch_date_format='%y-%m-%d %H:%M'
-let g:notmuch_datetime_format='%y-%m-%d %H:%M'
-let g:notmuch_show_date_format='%Y/%m/%d  %H:%M'
-let g:notmuch_search_date_format='%Y/%m/%d  %H:%M'
-let g:notmuch_html_converter='@elinks@/bin/elinks --dump'
-
 " lastplace
 let g:lastplace_ignore = "gitcommit,gitrebase,svn,hgcommit"
 
diff --git a/config/users/kat/dev/default.nix b/config/users/kat/dev/default.nix
index 8518260f..094efdb2 100644
--- a/config/users/kat/dev/default.nix
+++ b/config/users/kat/dev/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./vim
+    ./rink.nix
     ./zsh.nix
     ./rustfmt.nix
     ./packages.nix
diff --git a/config/users/kat/base/rink.nix b/config/users/kat/dev/rink.nix
similarity index 100%
rename from config/users/kat/base/rink.nix
rename to config/users/kat/dev/rink.nix
diff --git a/config/users/kat/personal/vim/default.nix b/config/users/kat/personal/vim/default.nix
new file mode 100644
index 00000000..2f73a34e
--- /dev/null
+++ b/config/users/kat/personal/vim/default.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  programs.neovim = {
+    extraConfig = ''
+      ${source ./init.vim}
+    '';
+    plugins = with pkgs.vimPlugins; [
+      notmuch-vim
+    ];
+  };
+}
diff --git a/config/users/kat/personal/vim/init.vim b/config/users/kat/personal/vim/init.vim
new file mode 100644
index 00000000..577673d1
--- /dev/null
+++ b/config/users/kat/personal/vim/init.vim
@@ -0,0 +1,8 @@
+" notmuch!
+let g:notmuch_config_file=$XDG_CONFIG_HOME . '/notmuch/notmuchrc'
+let g:notmuch_folders_count_threads=0
+let g:notmuch_date_format='%y-%m-%d %H:%M'
+let g:notmuch_datetime_format='%y-%m-%d %H:%M'
+let g:notmuch_show_date_format='%Y/%m/%d  %H:%M'
+let g:notmuch_search_date_format='%Y/%m/%d  %H:%M'
+let g:notmuch_html_converter='@elinks@/bin/elinks --dump'