From d705c9b81d2450cd2080911a0cb7a1f4f68be7c7 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Tue, 25 Oct 2022 21:44:56 -0400
Subject: [PATCH] Messing with aerc. Messing with neovim. Adding and removing
 some apps

---
 home-cli.nix  | 24 ++++++++++++------------
 home-mail.nix | 26 +++++++++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/home-cli.nix b/home-cli.nix
index e93df57..8397077 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -7,21 +7,22 @@ in
   home.stateVersion = "18.09";
 
   home.packages = with pkgs; [ # magic-wormhole
-    ripgrep fd mosh w3m nnn hexyl httpie timg sox du-dust duplicati bitwarden-cli gnupg gpg-tui rage sd libqalculate glow restic spotify-tui spotifyd slides amfora duf pandoc pastel jq jo fx jc miller visidata sc-im cacert weechat
+    ripgrep fd mosh w3m nnn hexyl wget httpie timg sox du-dust duplicati bitwarden-cli gnupg gpg-tui rage sd libqalculate glow spotify-tui spotifyd amfora duf pandoc pastel jq jo fx jc miller visidata sc-im cacert weechat ddgr
     nixfmt shellcheck vale tectonic zathura # lilypond-with-fonts
     nodejs deno yarn nodePackages.typescript-language-server nodePackages.stylelint nodePackages.js-beautify nodePackages.expo-cli
     ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin
     rustc go cmake # racket-minimal
     cargo # ghc haskell-language-server hlint haskellPackages.hoogle
+    lua53Packages.luarocks
     ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es
     fontconfig iosevka iosevka-bin
   ];
 
   home.sessionVariables = {
-    EDITOR = "${builtins.getEnv "HOME"}/.local/bin/lvim";
+    EDITOR = "vim";
     BROWSER = "open";
     MANPAGER = "sh -c 'col -bx | bat -l man -p'";
-    PATH = "$PATH:${builtins.getEnv "HOME"}/.cargo/bin";
+    PATH = "$PATH:${builtins.getEnv "HOME"}/.cargo/bin:${builtins.getEnv "HOME"}/.local/bin";
     EXA_ICON_SPACING = 2;
   };
 
@@ -83,7 +84,6 @@ in
       h = "himalaya";
       er = "rm -rf logs; unzip -o";
       srsync = "rsync --rsync-path='sudo rsync'";
-      vim = "~/.local/bin/lvim";
       lg = "lazygit";
       ambient1 = "play -n -c1 synth whitenoise lowpass -1 120 lowpass -1 120 lowpass -1 120 gain +16";
       ambient2 = "play -c 2 -n synth brownnoise lowpass 200";
@@ -213,11 +213,11 @@ in
   programs.helix = {
     enable = true;
     settings = {
-      theme = "nord";
-      lsp.display-messages = true;
-      keys.normal = {
-        C-h = "jump_view_left";
-        C-l = "jump_view_right";
+      theme = "catpuccin";
+      editor = {
+        cursorline = true;
+        lsp.display-messages = true;
+        indent-guides.render = true;
       };
     };
   };
@@ -232,9 +232,9 @@ in
     withRuby = true;
   };
 
-  home.file.lunarVim = {
-    target = ".config/lvim/config.lua";
-    source = ./lunar.lua;
+  home.file.nvim = {
+    target = ".config/nvim/init.lua";
+    source = ./init.lua;
   };
 
   programs.bat = {
diff --git a/home-mail.nix b/home-mail.nix
index 3ef1f48..80610d9 100644
--- a/home-mail.nix
+++ b/home-mail.nix
@@ -4,7 +4,7 @@ let
   secrets = import ./secrets.nix;
 in
 {
-  home.packages = with pkgs; [ aerc vdirsyncer khard imapnotify ]; # khal
+  home.packages = with pkgs; [ vdirsyncer khard imapnotify ]; # khal
 
   programs.mbsync.enable = true;
 
@@ -18,6 +18,13 @@ in
 
   programs.himalaya.enable = true;
 
+  programs.aerc = {
+    enable = true;
+    extraConfig = {
+      general = { unsafe-accounts-conf = true; };
+    };
+  };
+
   programs.mu.enable = true;
 
   accounts.email = {
@@ -56,6 +63,7 @@ in
         mu.enable = true;
         msmtp.enable = true;
         neomutt.enable = true;
+        aerc.enable = true;
         himalaya = {
           enable = true;
           settings = {
@@ -71,14 +79,14 @@ in
     };
   };
 
-  home.file.aerc-accounts = {
-    target = ".config/aerc/accounts.conf";
-    text = ''[FastMail]
-source = maildir://~/Mail/FastMail
-from = "Dustin Swan <dustin@dustinswan.com>"
-outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from
-'';
-  };
+#   home.file.aerc-accounts = {
+#     target = ".config/aerc/accounts.conf";
+#     text = ''[FastMail]
+# source = maildir://~/Mail/FastMail
+# from = "Dustin Swan <dustin@dustinswan.com>"
+# outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from
+# '';
+#   };
 
   home.file.vdirsyncer = {
     target = ".config/vdirsyncer/config";