From 720950141a83c32c8f298d51ecdae6d54a1b44b8 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Fri, 8 May 2020 17:08:42 -0400 Subject: [PATCH] More cleanin --- bin/browser | 2 - bin/renew_weechat_cert.sh | 7 --- home-mail.nix | 116 ++++++++++++++++++++++++++------------ vdirsyncer/config | 37 ------------ vimrc | 3 - 5 files changed, 79 insertions(+), 86 deletions(-) delete mode 100755 bin/browser delete mode 100755 bin/renew_weechat_cert.sh delete mode 100644 vdirsyncer/config diff --git a/bin/browser b/bin/browser deleted file mode 100755 index 7ab25b8..0000000 --- a/bin/browser +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -open -a Firefox.app "$1" diff --git a/bin/renew_weechat_cert.sh b/bin/renew_weechat_cert.sh deleted file mode 100755 index c484d5b..0000000 --- a/bin/renew_weechat_cert.sh +++ /dev/null @@ -1,7 +0,0 @@ -#/bin/bash - -cat /var/lib/acme/dustinswan.com/key.pem \ - /var/lib/acme/dustinswan.com/fullchain.pem > \ - /home/dustinswan/.weechat/ssl/relay.pem - -chown dustinswan.users /home/dustinswan/.weechat/ssl/relay.pem diff --git a/home-mail.nix b/home-mail.nix index 99193b6..0d55623 100644 --- a/home-mail.nix +++ b/home-mail.nix @@ -1,43 +1,6 @@ { pkgs, ... }: { - home.file.aerc-accounts = { - target = ".config/aerc/accounts.conf"; - text = ''[FastMail] -source = maildir://~/Mail/FastMail -from = "Dustin Swan " -outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from -''; -# text = ''[FastMail] -# source = imaps://dustinswan%40fastmail.com@mail.messagingengine.com:993 -# from = "Dustin Swan " -# outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from -# sourc-cred-cmd = "gpg -dq ${builtins.getEnv "HOME"}/.dustinswan@fastmail.com-password.gpg" -# ''; - }; - - home.file.khard = { - target = ".config/khard/config"; - text = ''[addressbooks] -[[contacts]] -path = ~/Contacts/Default''; - }; - - home.file.khal = { - target = ".config/khal/config"; - text = ''[calendars] -[[Fastmail]] -path = ~/Calendars/* -type = discover - -[locale] -timeformat = %H:%M -dateformat = %Y-%m-%d -longdateformat = %Y-%m-%d -datetimeformat = %Y-%m-%d %H:%M -longdatetimeformat = %Y-%m-%d %H:%M''; - }; - programs.neomutt = { enable = true; sidebar.enable = true; @@ -77,4 +40,83 @@ longdatetimeformat = %Y-%m-%d %H:%M''; }; }; }; + + home.file.aerc-accounts = { + target = ".config/aerc/accounts.conf"; + text = ''[FastMail] +source = maildir://~/Mail/FastMail +from = "Dustin Swan " +outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from +''; +# text = ''[FastMail] +# source = imaps://dustinswan%40fastmail.com@mail.messagingengine.com:993 +# from = "Dustin Swan " +# outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from +# sourc-cred-cmd = "gpg -dq ${builtins.getEnv "HOME"}/.dustinswan@fastmail.com-password.gpg" +# ''; + }; + + home.file.vdirsyncer = { + target = ".config/vdirsyncer/config"; + text = ''[general] +status_path = "~/.vdirsyncer/status/" + +[pair fastmail_contacts] +a = "fastmail_contacts_local" +b = "fastmail_contacts_remote" +collections = ["from b"] +conflict_resolution = "b wins" + +[storage fastmail_contacts_local] +type = "filesystem" +path = "~/Contacts/" +fileext = ".vcf" + +[storage fastmail_contacts_remote] +type = "carddav" +url = "https://carddav.messagingengine.com/" +username = "dustinswan@fastmail.com" +password.fetch = ["command", "~/dotfiles/bin/decrypt-password", "dustinswan@fastmail.com"] + +[pair fastmail_calendar] +a = "fastmail_calendar_local" +b = "fastmail_calendar_remote" +collections = ["from b"] +conflict_resolution = "b wins" +metadata = ["color", "displayname"] + +[storage fastmail_calendar_local] +type = "filesystem" +path = "~/Calendars/" +fileext = ".ics" + +[storage fastmail_calendar_remote] +type = "caldav" +url = "https://caldav.messagingengine.com/" +username = "dustinswan@fastmail.com" +password.fetch = ["command", "~/dotfiles/bin/decrypt-password", "dustinswan@fastmail.com"]''; + }; + + home.file.khard = { + target = ".config/khard/config"; + text = ''[addressbooks] +[[contacts]] +path = ~/Contacts/Default''; + }; + + home.file.khal = { + target = ".config/khal/config"; + text = ''[calendars] +[[Fastmail]] +path = ~/Calendars/* +type = discover + +[locale] +timeformat = %H:%M +dateformat = %Y-%m-%d +longdateformat = %Y-%m-%d +datetimeformat = %Y-%m-%d %H:%M +longdatetimeformat = %Y-%m-%d %H:%M''; + }; + } diff --git a/vdirsyncer/config b/vdirsyncer/config deleted file mode 100644 index 353c583..0000000 --- a/vdirsyncer/config +++ /dev/null @@ -1,37 +0,0 @@ -[general] -status_path = "~/.vdirsyncer/status/" - -[pair fastmail_contacts] -a = "fastmail_contacts_local" -b = "fastmail_contacts_remote" -collections = ["from b"] -conflict_resolution = "b wins" - -[storage fastmail_contacts_local] -type = "filesystem" -path = "~/Contacts/" -fileext = ".vcf" - -[storage fastmail_contacts_remote] -type = "carddav" -url = "https://carddav.messagingengine.com/" -username = "dustinswan@fastmail.com" -password.fetch = ["command", "~/dotfiles/bin/decrypt-password", "dustinswan@fastmail.com"] - -[pair fastmail_calendar] -a = "fastmail_calendar_local" -b = "fastmail_calendar_remote" -collections = ["from b"] -conflict_resolution = "b wins" -metadata = ["color", "displayname"] - -[storage fastmail_calendar_local] -type = "filesystem" -path = "~/Calendars/" -fileext = ".ics" - -[storage fastmail_calendar_remote] -type = "caldav" -url = "https://caldav.messagingengine.com/" -username = "dustinswan@fastmail.com" -password.fetch = ["command", "~/dotfiles/bin/decrypt-password", "dustinswan@fastmail.com"] diff --git a/vimrc b/vimrc index dda19d0..cf5317a 100644 --- a/vimrc +++ b/vimrc @@ -97,9 +97,6 @@ nnoremap p4 :! p4 edit % nnoremap v vl nnoremap s sj -" Browser -let g:netrw_browsex_viewer = "browser" - " FZF nnoremap a :Ag nnoremap f :Files