From 6a9e5737314d6d9ecc75bcee2e7fed26dd7fc2c1 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Mon, 17 Jan 2022 20:43:44 -0500 Subject: [PATCH] Mail, himalaya, rectangle, offlineimap -> mbsync, imapnotify (not done yet), etc. --- rectangle.json => RectangleConfig.json | 119 ++++++++++++++++--------- bin/sync | 4 +- home-mail.nix | 35 ++++++-- 3 files changed, 103 insertions(+), 55 deletions(-) rename rectangle.json => RectangleConfig.json (87%) diff --git a/rectangle.json b/RectangleConfig.json similarity index 87% rename from rectangle.json rename to RectangleConfig.json index 03e5d6b..38098fc 100644 --- a/rectangle.json +++ b/RectangleConfig.json @@ -1,43 +1,52 @@ { "defaults" : { - "centerHalfCycles" : { - "int" : 0 + "almostMaximizeWidth" : { + "float" : 0 }, "curtainChangeSize" : { "int" : 0 }, - "allowAnyShortcut" : { - "bool" : false + "centerHalfCycles" : { + "int" : 0 }, "ignoredSnapAreas" : { "int" : 0 }, - "almostMaximizeWidth" : { - "float" : 0 + "allowAnyShortcut" : { + "bool" : false }, "screenEdgeGapBottom" : { "float" : 0 }, + "moveCursor" : { + "int" : 0 + }, "todoMode" : { "bool" : false }, "screenEdgeGapTop" : { "float" : 0 }, - "SUEnableAutomaticChecks" : { - "bool" : true + "todoSidebarWidth" : { + "float" : 400 }, - "gapSize" : { - "float" : 4 + "fullIgnoreBundleIds" : { + + }, + "specifiedHeight" : { + "float" : 1050 }, "disabledApps" : { }, - "todoSidebarWidth" : { - "float" : 400 + "gapSize" : { + "float" : 2 }, "todoApplication" : { - + "string" : "io.alacritty" + }, + "SUEnableAutomaticChecks" : { + "bool" : true }, "centeredDirectionalMove" : { "int" : 0 @@ -48,9 +57,21 @@ "snapEdgeMarginTop" : { "float" : 5 }, + "autoMaximize" : { + "int" : 0 + }, "snapModifiers" : { "int" : 0 }, + "applyGapsToMaximize" : { + "int" : 2 + }, + "moveCursorAcrossDisplays" : { + "int" : 0 + }, + "applyGapsToMaximizeHeight" : { + "int" : 0 + }, "altThirdCycle" : { "int" : 0 }, @@ -60,21 +81,27 @@ "hideMenubarIcon" : { "bool" : false }, + "minimumWindowHeight" : { + "float" : 0 + }, "traverseSingleScreen" : { "int" : 0 }, - "snapEdgeMarginBottom" : { - "float" : 5 - }, - "minimumWindowHeight" : { - "float" : 0 + "specifiedWidth" : { + "float" : 1680 }, "footprintFade" : { "int" : 0 }, + "snapEdgeMarginBottom" : { + "float" : 5 + }, "screenEdgeGapRight" : { "float" : 0 }, + "notifiedOfProblemApps" : { + "bool" : false + }, "screenEdgeGapLeft" : { "float" : 0 }, @@ -85,7 +112,7 @@ "bool" : true }, "subsequentExecutionMode" : { - "int" : 1 + "int" : 4 }, "footprintBorderWidth" : { "float" : 2 @@ -94,14 +121,14 @@ "bool" : false }, "windowSnapping" : { - "int" : 2 - }, - "todo" : { - "int" : 0 + "int" : 1 }, "snapEdgeMarginLeft" : { "float" : 5 }, + "todo" : { + "int" : 1 + }, "obtainWindowOnClick" : { "int" : 0 }, @@ -110,15 +137,15 @@ }, "footprintAlpha" : { "float" : 0.30000001192092896 - }, - "footprintColor" : { - }, "minimumWindowWidth" : { "float" : 0 }, "attemptMatchOnNextPrevDisplay" : { "int" : 0 + }, + "footprintColor" : { + }, "almostMaximizeHeight" : { "float" : 0 @@ -135,22 +162,22 @@ "keyCode" : 123, "modifierFlags" : 1835008 }, - "bottomRightSixth" : { - "keyCode" : 22, - "modifierFlags" : 1835008 - }, "maximizeHeight" : { "keyCode" : 126, "modifierFlags" : 917504 }, - "topLeft" : { - "keyCode" : 32, - "modifierFlags" : 786432 + "bottomRightSixth" : { + "keyCode" : 22, + "modifierFlags" : 1835008 }, "bottomCenterSixth" : { "keyCode" : 23, "modifierFlags" : 1835008 }, + "topLeft" : { + "keyCode" : 32, + "modifierFlags" : 786432 + }, "bottomLeftSixth" : { "keyCode" : 21, "modifierFlags" : 1835008 @@ -179,24 +206,24 @@ "keyCode" : 125, "modifierFlags" : 786432 }, - "rightHalf" : { - "keyCode" : 124, - "modifierFlags" : 786432 - }, "bottomLeft" : { "keyCode" : 38, "modifierFlags" : 786432 }, - "smaller" : { - "keyCode" : 27, + "rightHalf" : { + "keyCode" : 124, + "modifierFlags" : 786432 + }, + "centerThird" : { + "keyCode" : 3, "modifierFlags" : 786432 }, "bottomRight" : { "keyCode" : 40, "modifierFlags" : 786432 }, - "centerThird" : { - "keyCode" : 3, + "firstTwoThirds" : { + "keyCode" : 14, "modifierFlags" : 786432 }, "topRightSixth" : { @@ -211,10 +238,14 @@ "keyCode" : 126, "modifierFlags" : 786432 }, - "firstTwoThirds" : { - "keyCode" : 14, + "smaller" : { + "keyCode" : 27, "modifierFlags" : 786432 }, + "almostMaximize" : { + "keyCode" : 36, + "modifierFlags" : 1835008 + }, "center" : { "keyCode" : 8, "modifierFlags" : 786432 @@ -241,5 +272,5 @@ } }, "bundleId" : "com.knollsoft.Rectangle", - "version" : "50" + "version" : "55" } \ No newline at end of file diff --git a/bin/sync b/bin/sync index 9a1a336..78ade86 100755 --- a/bin/sync +++ b/bin/sync @@ -1,7 +1,7 @@ #!/bin/sh -if command -v offlineimap &> /dev/null; then - offlineimap +if command -v mbsync &> /dev/null; then + mbsync -a fi if command -v vdirsyncer &> /dev/null; then diff --git a/home-mail.nix b/home-mail.nix index c504224..f8a5e66 100644 --- a/home-mail.nix +++ b/home-mail.nix @@ -1,14 +1,15 @@ { pkgs, ... }: { - home.packages = with pkgs; [ aerc vdirsyncer ]; - programs.offlineimap.enable = true; + home.packages = with pkgs; [ aerc vdirsyncer imapnotify ]; + programs.mbsync.enable = true; programs.msmtp.enable = true; programs.neomutt = { enable = true; sidebar.enable = true; sort = "reverse-threads"; }; + programs.himalaya.enable = true; accounts.email = { maildirBasePath = "Mail"; @@ -28,18 +29,34 @@ }; userName = "dustinswan@fastmail.com"; imap.host = "mail.messagingengine.com"; + imap.port = 993; smtp.host = "mail.messagingengine.com"; + smtp.port = 465; passwordCommand = "gpg -dq ${builtins.getEnv "HOME"}/.dustinswan@fastmail.com-password.gpg"; - offlineimap.enable = true; + mbsync = { + enable = true; + create = "maildir"; + }; + # imapnotify = { + # enable = true; + # boxes = [ "INBOX" ]; + # onNotify = "\${pkgs.isync}/bin/mbsync -a"; + # onNotifyPost = { mail = "\${pkgs.noti}/bin/noti 'New mail'"; }; + # }; + mu.enable = true; msmtp.enable = true; neomutt.enable = true; - signature = { - text = '' - Dustin Swan - dustinswan.com - ''; - showSignature = "append"; + himalaya = { + enable = true; + settings = { + sent-folder = "INBOX.Sent"; + draft-folder = "INBOX.Drafts"; + }; }; + # signature = { + # text = ''Dustin Swan | dustinswan.com''; + # showSignature = "append"; + # }; }; }; };