4 files changed, 23 insertions, 6 deletions
diff --git a/home-manager/config/default.nix b/home-manager/config/default.nix
index 63426505..6b582094 100644
--- a/home-manager/config/default.nix
+++ b/home-manager/config/default.nix
@@ -10,6 +10,7 @@
     ./git
     ./grades
     ./gtk
+    ./himalaya
     ./keepassxc
     ./latexindent
     ./less
@@ -18,6 +19,7 @@
     ./mako
     ./mpd
     ./mpv
+    ./neomutt
     ./neovim
     ./nheko
     ./npm
diff --git a/home-manager/config/himalaya/default.nix b/home-manager/config/himalaya/default.nix
new file mode 100644
index 00000000..fcc768b2
--- /dev/null
+++ b/home-manager/config/himalaya/default.nix
@@ -0,0 +1,10 @@
+{...}: {
+  programs.himalaya = {
+    enable = true;
+    settings = {
+      # TODO
+    };
+  };
+}
+# vim: ts=2
+
diff --git a/home-manager/config/mail/default.nix b/home-manager/config/mail/default.nix
index 05ff5d76..8b84442c 100644
--- a/home-manager/config/mail/default.nix
+++ b/home-manager/config/mail/default.nix
@@ -1,12 +1,6 @@
 {
   ...
 }: {
-  programs.himalaya = {
-    enable = true;
-    settings = {
-      # TODO
-    };
-  };
   accounts.email.accounts = {
     soispha = {
       address = "soispha@vhack.eu";
@@ -28,6 +22,9 @@
       signature = {
         # TODO
       };
+      neomutt = {
+        enable = true;
+      };
       himalaya = {
         enable = true;
         backend = "imap";
diff --git a/home-manager/config/neomutt/default.nix b/home-manager/config/neomutt/default.nix
new file mode 100644
index 00000000..eebe1c12
--- /dev/null
+++ b/home-manager/config/neomutt/default.nix
@@ -0,0 +1,8 @@
+{...}: {
+  programs.neomutt = {
+    enable = true;
+    vimKeys = true;
+  };
+}
+# vim: ts=2
+