diff --git a/gpg-agent.conf b/gpg-agent.conf deleted file mode 100644 index e5b49c4..0000000 --- a/gpg-agent.conf +++ /dev/null @@ -1,3 +0,0 @@ -pinentry-program /Users/dustinswan/.nix-profile/bin/pinentry -default-cache-ttl 86400 -max-cache-ttl 86400 diff --git a/home-common.nix b/home-common.nix index 3afb818..8e5fc0b 100644 --- a/home-common.nix +++ b/home-common.nix @@ -2,7 +2,7 @@ { home.packages = with pkgs; [ - ripgrep fd wget silver-searcher tree ranger nodejs yarn mosh msmtp w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier ffmpeg ispell aspell hexyl nnn entr httpie cacert pinentry + ripgrep fd wget silver-searcher tree ranger nodejs yarn mosh w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier ffmpeg ispell aspell hexyl nnn entr httpie cacert ]; home.sessionVariables = { @@ -141,6 +141,11 @@ hostname = "dswan.iocom.com"; user = "ec2-user"; }; + + kmcglynn = { + hostname = "kmcglynn.iocom.com"; + user = "centos"; + }; }; }; @@ -190,9 +195,9 @@ }; }; - IOCOM = { - address = "dswan@iocom.com"; - aliases = "dswan@visionable.com"; + Visionable = { + address = "dswan@visionable.com"; + aliases= "dswan@iocom.com"; realName = "Dustin Swan"; folders = { inbox = "INBOX"; @@ -200,11 +205,40 @@ sent = "Sent Items"; trash = "Deleted Items"; }; - userName = "dswan@iocom.com"; - imap.host = "secure.emailsrvr.com"; - smtp.host = "secure.emailsrvr.com"; - passwordCommand = "gpg -dq /Users/dustinswan/.iocom-password.gpg"; - offlineimap.enable = true; + userName = "dswan@visionable.com"; + imap.host = "outlook.office365.com"; + smtp.host = "smtp.office365.com"; + passwordCommand = "gpg -dq /Users/dustinswan/.dswan@visionable.com-password.gpg"; + offlineimap = { + enable = true; + extraConfig.remote = { + folderfilter = ''lambda folder: folder not in [ + 'Calendar', + 'Calendar/Birthdays', + 'Calendar/IOCOM Holidays', + 'Calendar/United States holidays', + 'Contacts', + 'Contacts/Sub Folder 1', + 'Contacts/Sub Folder 2', + 'Contacts/Skype for Business Contacts', + 'Deleted Items', + 'Drafts', + 'Journal', + 'Junk Email', + 'Notes', + 'Outbox', + 'Sync Issues', + 'Sync Issues/Conflicts', + 'Sync Issues/Local Failures', + 'Sync Issues/Server Failures', + 'Tasks', + 'Tasks/Sub Folder 1', + 'Tasks/Sub Folder 2' + ] + ''; + }; + }; + msmtp.enable = true; signature = { text = '' @@ -227,10 +261,9 @@ vimAlias = true; withNodeJs = true; withPython3 = true; - # unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade floaterm - plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets coc-nvim fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter nerdtree emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify ]; + # unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade floaterm coc-nvim + plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter nerdtree emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify ]; extraConfig = '' - " TODO get stdtabs back set expandtab set tabstop=2 set softtabstop=2 diff --git a/home-mac.nix b/home-mac.nix new file mode 100644 index 0000000..533ae6b --- /dev/null +++ b/home-mac.nix @@ -0,0 +1,16 @@ +{ pkgs, lib, ... }: + +{ + home.packages = with pkgs; [ pinentry_mac ]; + + home.file.gpg-agent = { + target = ".gnupg/gpg-agent.conf"; + text = '' + pinentry-program ${builtins.getEnv "HOME"}/.nix-profile/bin/pinentry + default-cache-ttl 86400 + max-cache-ttl 86400 + ''; + }; + + imports = [ ./home-common.nix ]; +} diff --git a/msmtprc b/msmtprc deleted file mode 100644 index 1a313b6..0000000 --- a/msmtprc +++ /dev/null @@ -1,29 +0,0 @@ -defaults -protocol smtp -logfile "~/.msmtp.log" - -account FastMail -host mail.messagingengine.com -port 465 -protocol smtp -from dustin@dustinswan.com -user dustinswan@fastmail.com -passwordeval "gpg --no-tty -q -d ~/.dustinswan@fastmail.com-password.gpg" -auth on -tls on -tls_starttls off -# tls_trust_file "/usr/local/etc/openssl/cert.pem" - -account IOCOM -host secure.emailsrvr.com -protocol smtp -auth on -port 587 -from dswan@iocom.com -tls on -tls_starttls on -# tls_trust_file "/usr/local/etc/openssl/cert.pem" -user dswan@iocom.com -passwordeval "gpg --no-tty -q -d ~/.iocom-password.gpg" - -account default : FastMail diff --git a/symlinks.sh b/symlinks.sh index fb72654..85c0e9b 100644 --- a/symlinks.sh +++ b/symlinks.sh @@ -6,14 +6,9 @@ mkdir ~/.config/vdirsyncer; ln -sf ~/dotfiles/vdirsyncer/config ~/.config/vdirsy # mkdir ~/.gnupg; ln -sf ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf mkdir -p ~/.config/khard; ln -sf ~/dotfiles/khard.conf ~/.config/khard/khard.conf mkdir -p ~/.config/qutebrowser; ln -sf ~/dotfiles/qutebrowser.py ~/.config/qutebrowser/config.py -mkdir -p ~/.config/alacritty.yml; ln -sf ~/dotfiles/alacritty.yml ~/.config/alacritty/alacritty.yml mkdir -p ~/.config/rtv; ln -sf ~/dotfiles/rtv.cfg ~/.config/rtv/rtv.cfg -mkdir -p ~/.newsboat; ln -sf ~/dotfiles/newsboat ~/.newsboat/config ln -sf ~/dotfiles/mailcap ~/.mailcap -# Mail stuff -ln -sf ~/dotfiles/offlineimaprc ~/.offlineimaprc -ln -sf ~/dotfiles/msmtprc ~/.msmtprc ln -sf ~/dotfiles/muttrc ~/.muttrc ln -sf ~/dotfiles/mutt ~/.mutt @@ -21,6 +16,3 @@ ln -sf ~/dotfiles/mutt ~/.mutt # mv ~/.emacs.d ~/.emacs.bak # git clone --recursive http://github.com/syl20bnr/spacemacs ~/.emacs.d # ln -sf ~/dotfiles/spacemacs ~/.spacemacs - -# NixOS Home Manager -ln -sf ~/dotfiles/home.nix ~/.config/nixpkgs/home.nix