flake.nix

@@ -128,7 +128,7 @@
         mail.server = "noahmasur.com";
         mail.imapHost = "imap.purelymail.com";
         mail.smtpHost = "smtp.purelymail.com";
-        dotfilesRepo = "https://github.com/nmasur/dotfiles";
+        dotfilesRepo = "git@github.com:nmasur/dotfiles";
         hostnames = {
           git = "git.${baseName}";
           metrics = "metrics.${baseName}";

modules/common/default.nix

@@ -59,7 +59,7 @@
     };
     dotfilesRepo = lib.mkOption {
       type = lib.types.str;
-      description = "Link to dotfiles repository HTTPS URL.";
+      description = "Link to dotfiles repository.";
     };
     unfreePackages = lib.mkOption {
       type = lib.types.listOf lib.types.str;

modules/common/mail/default.nix

@@ -33,11 +33,7 @@
         postExec = "${pkgs.notmuch}/bin/notmuch new";
       };
       services.imapnotify.enable = pkgs.stdenv.isLinux;
-      programs.msmtp.enable = true;
+      programs.notmuch.enable = true;
-      programs.notmuch = {
-        enable = true;
-        new.ignore = [ ".mbsyncstate.lock" ".mbsyncstate.journal" ];
-      };
       accounts.email = {
         maildirBasePath = "${config.homePath}/mail";
         accounts = {
@@ -78,7 +74,6 @@
                 CopyArrivalDate = "yes"; # Sync time of original message
               };
             };
-            msmtp.enable = true;
             notmuch.enable = true;
             passwordCommand =
               "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${

modules/common/repositories/dotfiles.nix

@@ -14,8 +14,13 @@
           [ "writeBoundary" ] ''
             if [ ! -d "${config.dotfilesPath}" ]; then
                 $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
-                $DRY_RUN_CMD ${pkgs.git}/bin/git \
+
-                    clone ${config.dotfilesRepo} "${config.dotfilesPath}"
+                # Force HTTPS because anonymous SSH doesn't work
+                GIT_CONFIG_COUNT=1 \
+                    GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" \
+                    GIT_CONFIG_VALUE_0="git@github.com:" \
+                    $DRY_RUN_CMD \
+                    ${pkgs.git}/bin/git clone ${config.dotfilesRepo} "${config.dotfilesPath}"
             fi
           '';
 

modules/common/shell/utilities.nix

@@ -23,7 +23,6 @@ in {
         dig # DNS lookup
         fd # find
         htop # Show system processes
-        killall # Force quit
         inetutils # Includes telnet, whois
         jq # JSON manipulation
         lf # File viewer