From 6ace5b4a6d09cd63caf690a5b9af49b88e34a7b8 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 28 Mar 2023 09:31:09 -0500 Subject: [PATCH] adding back LightlyShaders and switching to home-manager based email --- pkgs/desktop-packages.nix | 2 +- user/home.nix | 398 +++++++++++++++++++++----------------- 2 files changed, 221 insertions(+), 179 deletions(-) diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 75ca3cd..62a1601 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -125,7 +125,7 @@ with lib; airshipper # hyprland (callPackage ../ydotool { }) - # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # LightlyShaders + (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # LightlyShaders # (libsForQt5.callPackage /home/chris/.dotfiles/RoundedSBE {}) # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter nix-index diff --git a/user/home.nix b/user/home.nix index 9b2bfc1..9826314 100644 --- a/user/home.nix +++ b/user/home.nix @@ -22,42 +22,84 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; - # accounts.email.accounts = { - # personal = { - # address = "chris@cochrun.xyz"; - # mbsync.enable = true; - # create = "maildir"; - # mu.enable = true; - # flavor = "plain"; - # imap = { - # host = "mail.cochrun.xyz"; - # port = 993; - # tls.enable = true; - # }; - # smtp = { - # host = "mail.cochrun.xyz"; - # port = 25; - # tls.enable = true; - # }; - # }; - # work = { - # address = "chris@tfcconnection.org"; - # mbsync.enable = true; - # create = "maildir"; - # mu.enable = true; - # flavor = "outlook.office365.com"; - # imap = { - # host = "outlook.office365.com"; - # port = 993; - # tls.enable = true; - # }; - # smtp = { - # host = "mail.cochrun.xyz"; - # port = 25; - # tls.enable = true; - # }; - # }; - # }; + accounts.email = { + accounts = { + personal = { + address = "chris@cochrun.xyz"; + userName = "chris@cochrun.xyz"; + mbsync.enable = true; + mu.enable = true; + flavor = "plain"; + primary = true; + passwordCommand = "${pkgs.rbw}/bin/rbw get 'Office 365'"; + realName = "Chris Cochrun"; + signature = { + text = '' + Praising God in all things, + Chris Cochrun + ''; + delimiter = '' + *** + ''; + showSignature = "append"; + }; + imap = { + host = "mail.cochrun.xyz"; + port = 993; + tls.enable = true; + }; + smtp = { + host = "mail.cochrun.xyz"; + port = 25; + tls.enable = true; + }; + mbsync = { + create = "maildir"; + remove = "both"; + expunge = "both"; + }; + maildir.path = "cochrun"; + }; + work = { + address = "chris@tfcconnection.org"; + userName = "chris@tfcconnection.org"; + mbsync.enable = true; + mu.enable = true; + flavor = "outlook.office365.com"; + passwordCommand = "${pkgs.rbw}/bin/rbw get --full 'Office 365' | ${pkgs.ripgrep}/bin/rg 'sylemail' | ${pkgs.gawk}/bin/awk '{print $2}'"; + realName = "Chris Cochrun"; + imap = { + host = "outlook.office365.com"; + port = 993; + tls.enable = true; + }; + smtp = { + host = "smtp.office365.com"; + port = 587; + tls.enable = true; + }; + mbsync = { + create = "maildir"; + remove = "both"; + expunge = "both"; + extraConfig.account = { + AuthMechs = "LOGIN"; + }; + }; + maildir.path = "office"; + signature = { + text = '' + Praising God in all things, + Chris Cochrun + ''; + delimiter = '' + *** + ''; + showSignature = "append"; + }; + }; + }; + }; programs.git = { enable = true; @@ -72,168 +114,168 @@ programs.mbsync = { enable = true; - extraConfig = '' - IMAPAccount gmail - Host imap.gmail.com - User ccochrun21@gmail.com - PassCmd "${pkgs.rbw}/bin/rbw get gmail" - AuthMechs LOGIN - SSLType IMAPS - SSLVersions SSLv3 - # CertificateFile /opt/local/share/curl/curl-ca-bundle.crt - - IMAPAccount office - Host outlook.office365.com - User chris@tfcconnection.org - PassCmd "${pkgs.rbw}/bin/rbw get --full 'Office 365' | ${pkgs.ripgrep}/bin/rg 'mbsync pass' | ${pkgs.gawk}/bin/awk '{print $3}'" - AuthMechs LOGIN - SSLType IMAPS - - IMAPAccount outlook - Host outlook.office365.com - User chris.cochrun@outlook.com - PassCmd "${pkgs.rbw}/bin/rbw get outlook" - AuthMechs LOGIN - SSLType IMAPS - - IMAPAccount cochrun - Host mail.cochrun.xyz - User chris@cochrun.xyz - PassCmd "${pkgs.rbw}/bin/rbw get 'Office 365'" - AuthMechs LOGIN - SSLType IMAPS + # extraConfig = '' + # IMAPAccount gmail + # Host imap.gmail.com + # User ccochrun21@gmail.com + # PassCmd "${pkgs.rbw}/bin/rbw get gmail" + # AuthMechs LOGIN + # SSLType IMAPS # SSLVersions SSLv3 - # CertificateFile /opt/local/share/curl/curl-ca-bundle.crt - # THEN WE SPECIFY THE LOCAL AND REMOTE STORAGE - # - THE REMOTE STORAGE IS WHERE WE GET THE MAIL FROM (E.G., THE - # SPECIFICATION OF AN IMAP ACCOUNT) - # - THE LOCAL STORAGE IS WHERE WE STORE THE EMAIL ON OUR COMPUTER + # # CertificateFile /opt/local/share/curl/curl-ca-bundle.crt - # REMOTE STORAGE (USE THE IMAP ACCOUNT SPECIFIED ABOVE) - IMAPStore gmail-remote - Account gmail + # IMAPAccount office + # Host outlook.office365.com + # User chris@tfcconnection.org + # PassCmd "${pkgs.rbw}/bin/rbw get --full 'Office 365' | ${pkgs.ripgrep}/bin/rg 'sylemail' | ${pkgs.gawk}/bin/awk '{print $2}'" + # AuthMechs LOGIN + # SSLType IMAPS - MaildirStore gmail-local - Path ~/Maildir/gmail/ - Inbox ~/Maildir/gmail/INBOX + # IMAPAccount outlook + # Host outlook.office365.com + # User chris.cochrun@outlook.com + # PassCmd "${pkgs.rbw}/bin/rbw get outlook" + # AuthMechs LOGIN + # SSLType IMAPS - IMAPStore office-remote - Account office + # IMAPAccount cochrun + # Host mail.cochrun.xyz + # User chris@cochrun.xyz + # PassCmd "${pkgs.rbw}/bin/rbw get 'Office 365'" + # AuthMechs LOGIN + # SSLType IMAPS + # # SSLVersions SSLv3 + # # CertificateFile /opt/local/share/curl/curl-ca-bundle.crt + # # THEN WE SPECIFY THE LOCAL AND REMOTE STORAGE + # # - THE REMOTE STORAGE IS WHERE WE GET THE MAIL FROM (E.G., THE + # # SPECIFICATION OF AN IMAP ACCOUNT) + # # - THE LOCAL STORAGE IS WHERE WE STORE THE EMAIL ON OUR COMPUTER - # LOCAL STORAGE (CREATE DIRECTORIES with mkdir -p Maildir/gmail) + # # REMOTE STORAGE (USE THE IMAP ACCOUNT SPECIFIED ABOVE) + # IMAPStore gmail-remote + # Account gmail - MaildirStore office-local - Path ~/Maildir/office/ - Inbox ~/Maildir/office/INBOX - Subfolders Verbatim + # MaildirStore gmail-local + # Path ~/Maildir/gmail/ + # Inbox ~/Maildir/gmail/INBOX + + # IMAPStore office-remote + # Account office + + # # LOCAL STORAGE (CREATE DIRECTORIES with mkdir -p Maildir/gmail) + + # MaildirStore office-local + # Path ~/Maildir/office/ + # Inbox ~/Maildir/office/INBOX + # Subfolders Verbatim - IMAPStore outlook-remote - Account outlook + # IMAPStore outlook-remote + # Account outlook - MaildirStore outlook-local - Path ~/Maildir/outlook/ - Inbox ~/Maildir/outlook/INBOX - Subfolders Verbatim + # MaildirStore outlook-local + # Path ~/Maildir/outlook/ + # Inbox ~/Maildir/outlook/INBOX + # Subfolders Verbatim - IMAPStore cochrun-remote - Account cochrun + # IMAPStore cochrun-remote + # Account cochrun - MaildirStore cochrun-local - Path ~/Maildir/cochrun/ - Inbox ~/Maildir/cochrun/INBOX - Subfolders Verbatim + # MaildirStore cochrun-local + # Path ~/Maildir/cochrun/ + # Inbox ~/Maildir/cochrun/INBOX + # Subfolders Verbatim - # CONNECTIONS SPECIFY LINKS BETWEEN REMOTE AND LOCAL FOLDERS - # - # CONNECTIONS ARE SPECIFIED USING PATTERNS, WHICH MATCH REMOTE MAIl - # FOLDERS. SOME COMMONLY USED PATTERS INCLUDE: - # - # 1 "*" TO MATCH EVERYTHING - # 2 "!DIR" TO EXCLUDE "DIR" - # 3 "DIR" TO MATCH DIR + # # CONNECTIONS SPECIFY LINKS BETWEEN REMOTE AND LOCAL FOLDERS + # # + # # CONNECTIONS ARE SPECIFIED USING PATTERNS, WHICH MATCH REMOTE MAIl + # # FOLDERS. SOME COMMONLY USED PATTERS INCLUDE: + # # + # # 1 "*" TO MATCH EVERYTHING + # # 2 "!DIR" TO EXCLUDE "DIR" + # # 3 "DIR" TO MATCH DIR - Channel gmail-inbox - Far :gmail-remote: - Near :gmail-local: - Patterns "INBOX" - Create Both - Expunge Both - SyncState * - - Channel gmail-trash - Far :gmail-remote:"[Gmail]/Bin" - Near :gmail-local:"[Gmail].Bin" - Create Both - Expunge Both - SyncState * - - Channel gmail-sent - Far :gmail-remote:"[Gmail]/Sent Mail" - Near :gmail-local:"[Gmail].Sent Mail" - Create Both - Expunge Both - SyncState * - - Channel gmail-all - Far :gmail-remote:"[Gmail]/All Mail" - Near :gmail-local:"[Gmail].All Mail" - Create Both - Expunge Both - SyncState * - - Channel gmail-starred - Far :gmail-remote:"[Gmail]/Starred" - Near :gmail-local:"[Gmail].Starred" - Create Both - Expunge Both - SyncState * - - Channel office-inbox - Far :office-remote: - Near :office-local: - Patterns "*" - Create Both - Expunge Both - SyncState * - - Channel outlook-inbox - Far :outlook-remote: - Near :outlook-local: - Patterns "*" - Create Both - Expunge Both - SyncState * - - Channel cochrun-inbox - Far :cochrun-remote: - Near :cochrun-local: - Patterns "*" - Create Both - Expunge Both - SyncState * - # GROUPS PUT TOGETHER CHANNELS, SO THAT WE CAN INVOKE - # MBSYNC ON A GROUP TO SYNC ALL CHANNELS - # - # FOR INSTANCE: "mbsync gmail" GETS MAIL FROM - # "gmail-inbox", "gmail-sent", and "gmail-trash" - # - # Group gmail # Channel gmail-inbox - # Channel gmail-sent + # Far :gmail-remote: + # Near :gmail-local: + # Patterns "INBOX" + # Create Both + # Expunge Both + # SyncState * + # Channel gmail-trash + # Far :gmail-remote:"[Gmail]/Bin" + # Near :gmail-local:"[Gmail].Bin" + # Create Both + # Expunge Both + # SyncState * + + # Channel gmail-sent + # Far :gmail-remote:"[Gmail]/Sent Mail" + # Near :gmail-local:"[Gmail].Sent Mail" + # Create Both + # Expunge Both + # SyncState * + # Channel gmail-all + # Far :gmail-remote:"[Gmail]/All Mail" + # Near :gmail-local:"[Gmail].All Mail" + # Create Both + # Expunge Both + # SyncState * + # Channel gmail-starred + # Far :gmail-remote:"[Gmail]/Starred" + # Near :gmail-local:"[Gmail].Starred" + # Create Both + # Expunge Both + # SyncState * - Group office - Channel office-inbox + # Channel office-inbox + # Far :office-remote: + # Near :office-local: + # Patterns "*" + # Create Both + # Expunge Both + # SyncState * - Group outlook - Channel outlook-inbox + # Channel outlook-inbox + # Far :outlook-remote: + # Near :outlook-local: + # Patterns "*" + # Create Both + # Expunge Both + # SyncState * - Group cochrun - Channel cochrun-inbox - ''; + # Channel cochrun-inbox + # Far :cochrun-remote: + # Near :cochrun-local: + # Patterns "*" + # Create Both + # Expunge Both + # SyncState * + # # GROUPS PUT TOGETHER CHANNELS, SO THAT WE CAN INVOKE + # # MBSYNC ON A GROUP TO SYNC ALL CHANNELS + # # + # # FOR INSTANCE: "mbsync gmail" GETS MAIL FROM + # # "gmail-inbox", "gmail-sent", and "gmail-trash" + # # + # # Group gmail + # # Channel gmail-inbox + # # Channel gmail-sent + # # Channel gmail-trash + # # Channel gmail-all + # # Channel gmail-starred + + # Group office + # Channel office-inbox + + # Group outlook + # Channel outlook-inbox + + # Group cochrun + # Channel cochrun-inbox + # ''; }; programs.msmtp.enable = true; services.mbsync.enable = true;