From 72c1267824fd008826eac5629366333248ca0fea Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Fri, 16 Jun 2023 14:53:20 -0600
Subject: [PATCH] Cleaning, adding some commands, etc.

---
 bin/sync      | 30 ++++++++++++++++++++++++------
 home-cli.nix  | 13 ++++++++++---
 home-mail.nix | 24 ++++++++++++------------
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/bin/sync b/bin/sync
index 56815e3..40deefe 100755
--- a/bin/sync
+++ b/bin/sync
@@ -1,13 +1,31 @@
 #!/bin/sh
 
-if command -v mbsync &> /dev/null; then
-  mbsync -a
+# Required parameters:
+# @raycast.schemaVersion 1
+# @raycast.title Test
+# @raycast.mode compact
+
+# Optional parameters:
+# @raycast.icon 🤖
+
+# Documentation:
+# @raycast.author dustinswan
+# @raycast.authorURL https://raycast.com/dustinswan
+
+if
+	command -v mbsync >/dev/null
+then
+	mbsync -a
 fi
 
-if command -v mu &> /dev/null; then
-  mu index
+if
+	command -v mu >/dev/null
+then
+	mu index
 fi
 
-if command -v vdirsyncer &> /dev/null; then
-  vdirsyncer sync
+if
+	command -v vdirsyncer >/dev/null
+then
+	vdirsyncer sync
 fi
diff --git a/home-cli.nix b/home-cli.nix
index 9bef696..9f67a46 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -7,7 +7,6 @@ in
   home.stateVersion = "18.09";
 
   home.packages = with pkgs; [
-    ripgrep
     fd
     mosh
     w3m
@@ -29,6 +28,8 @@ in
     glow
     spotify-tui
     spotifyd
+    yt-dlp
+    youtube-tui
     amfora
     duf
     pandoc
@@ -62,10 +63,14 @@ in
     ocamlPackages.ocp-indent
     ocamlPackages.merlin
     rustup
+    zig
     go
     cmake
-    racket-minimal
-    # ghc haskell-language-server hlint haskellPackages.hoogle
+    # racket-minimal
+    ghc
+    haskell-language-server
+    hlint
+    haskellPackages.hoogle
     lua53Packages.luarocks
     translate-shell
     ispell
@@ -142,6 +147,7 @@ in
       v = "vi";
       l = "exa -lah --icons --git";
       n = "nnn";
+      t = "trans";
       h = "himalaya";
       er = "rm -rf logs; unzip -o";
       srsync = "rsync --rsync-path='sudo rsync'";
@@ -336,6 +342,7 @@ in
   programs.noti.enable = true;
   programs.btop.enable = true;
   programs.tealdeer.enable = true;
+  programs.ripgrep.enable = true;
 
   programs.keychain = {
     enable = true;
diff --git a/home-mail.nix b/home-mail.nix
index 22a2899..6c4f00c 100644
--- a/home-mail.nix
+++ b/home-mail.nix
@@ -10,13 +10,13 @@ in
 
   programs.msmtp.enable = true;
 
-  programs.neomutt = {
-    enable = true;
-    sidebar.enable = true;
-    sort = "reverse-threads";
-  };
+  # programs.neomutt = {
+  #   enable = true;
+  #   sidebar.enable = true;
+  #   sort = "reverse-threads";
+  # };
 
-  programs.himalaya.enable = true;
+  # programs.himalaya.enable = true;
 
   programs.aerc = {
     enable = true;
@@ -34,7 +34,7 @@ in
     accounts = {
       FastMail = {
         address = "dustin@dustinswan.com";
-        aliases = ["dustinswan@gmail.com"];
+        aliases = [ "dustinswan@gmail.com" ];
         realName = "Dustin Swan";
         primary = true;
         folders = {
@@ -62,7 +62,7 @@ in
         # };
         mu.enable = true;
         msmtp.enable = true;
-        neomutt.enable = true;
+        # neomutt.enable = true;
         aerc.enable = true;
         # himalaya = {
         #   enable = true;
@@ -73,10 +73,10 @@ in
         #     draft-folder = "INBOX.Drafts";
         #   };
         # };
-        # signature = {
-        #   text = ''Dustin Swan | dustinswan.com'';
-        #   showSignature = "append";
-        # };
+        signature = {
+          text = ''Dustin Swan | dustinswan.com'';
+          showSignature = "append";
+        };
       };
     };
   };