From 2a83361681a03440cf644e5a398bb076d237cb5d Mon Sep 17 00:00:00 2001
From: Grigory Shipunov <blame@oxapentane.com>
Date: Fri, 17 Jun 2022 13:12:25 +0200
Subject: [PATCH] basic-tools.nix: reorganise

---
 flake.nix               |  1 +
 modules/basic-tools.nix | 13 ++-----------
 modules/mail.nix        |  7 +++++++
 3 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 modules/mail.nix

diff --git a/flake.nix b/flake.nix
index b05c1e6..d689807 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,7 @@
           ./modules/wireguard.nix
           ./modules/binary-caches.nix
           ./modules/science.nix
+          ./modules/mail.nix
         ];
       };
     };
diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix
index e42d162..4e8cf58 100644
--- a/modules/basic-tools.nix
+++ b/modules/basic-tools.nix
@@ -7,16 +7,14 @@
     fd
     file
     fzf
-    gitFull
+    git
     gnupg
     htop
     irssi
     killall
-    mercurial
     neovim
     ripgrep
     tealdeer
-    tokei
     traceroute
     tree
     liquidprompt
@@ -26,8 +24,6 @@
     bind
     nnn
     man-pages
-    neomutt
-    cachix
   ];
 
   nix = {
@@ -59,9 +55,6 @@
     vi = "nvim";
     vf = "$EDITOR $(fzf)";
     vff = "$EDITOR $(ls|fzf)";
-    ls = "exa";
-    ll = "exa -l";
-    l = "exa -al";
     ssh = "TERM=xterm-256color ssh";
     mutt = "neomutt";
   };
@@ -89,9 +82,7 @@
       LP_ENABLE_SCREEN_TITLE=1
     '';
   };
-  programs.msmtp = {
-    enable = true;
-  };
+
   programs.iftop.enable = true;
   programs.mosh.enable = true;
 }
diff --git a/modules/mail.nix b/modules/mail.nix
new file mode 100644
index 0000000..01538f8
--- /dev/null
+++ b/modules/mail.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    neomutt
+  ];
+
+  programs.msmtp.enable = true;
+}