From b00f513d779c92a604eb8067f104683afaa40ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?tr=C3=A9meur?= <eheu48@gmail.com>
Date: Thu, 28 Oct 2021 22:09:40 +0100
Subject: [PATCH] Add mail stuff, probably update for focal

---
 README.md           |  6 +-----
 dots/.offlineimaprc | 23 +++++++++++++++++++++++
 scripts/setup.sh    | 30 ++++++++++++++++--------------
 3 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 dots/.offlineimaprc

diff --git a/README.md b/README.md
index 14d93be..2d73ef6 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 # Dotfiles + scripts
 
-Run `dotset.sh` to create symlinks to dotfiles in `~`.
+Run `setup.sh` to set up. Now probably updated for focal??
 
 [This](https://codewinsarguments.co/2016/05/01/git-submodules-vs-git-subtrees) is the one thing I found that actually explains the difference between submodules/subtrees and how to use them.
-
-## To do
-
-A lot.
diff --git a/dots/.offlineimaprc b/dots/.offlineimaprc
new file mode 100644
index 0000000..e97985e
--- /dev/null
+++ b/dots/.offlineimaprc
@@ -0,0 +1,23 @@
+[general]
+accounts = Gmail
+maxsyncaccounts = 1
+
+[Account Gmail]
+localrepository = LocalGmail
+remoterepository = RepositoryGmail
+autorefresh = 5
+quick = 10
+postsynchook = mu index --maildir ~/Maildir
+
+[Repository LocalGmail]
+type = Maildir
+localfolders = ~/Maildir/Gmail
+
+[Repository RepositoryGmail]
+type = Gmail
+maxconnections = 2
+remoteuser = eheu48
+remotepass = # to be added
+folderfilter = lambda foldername: foldername not in ['[Gmail]/All Mail', '[Gmail]/Important', '[Gmail]/Tous les messages', '[Gmail]/Spam']
+sslcacertfile = /etc/ssl/certs/ca-certificates.crt
+# sslcacertfile = OS-DEFAULT
\ No newline at end of file
diff --git a/scripts/setup.sh b/scripts/setup.sh
index cad6ec7..f316763 100644
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -13,11 +13,11 @@ sudo add-apt-repository ppa:kelleyk/emacs
 
 # Add apt keys (non-free software)
 sudo apt install curl wget
-curl -sS https://download.spotify.com/debian/pubkey.gpg | sudo apt-key add - 
+curl -sS https://download.spotify.com/debian/pubkey_0D811D58.gpg | sudo apt-key add - 
 echo "deb http://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list
-wget -qO- https://github.com/retorquere/zotero-deb/releases/download/apt-get/install.sh | sudo bash
+# wget -qO- https://github.com/retorquere/zotero-deb/releases/download/apt-get/install.sh | sudo bash
 . /etc/os-release
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ACCAF35C
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ACCAF35C
 echo "deb http://apt.insync.io/$ID $VERSION_CODENAME non-free contrib" | sudo tee /etc/apt/sources.list.d/insync.list
 wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
 echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
@@ -25,7 +25,7 @@ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sud
 sudo apt update
 
 # Install things
-sudo apt install abcde arc-theme biber calibre cmus conky-all curl emacs26 evince eyed3 feh ffmpeg fonts-crosextra-carlito fonts-noto fonts-noto-color-emoji fonts-sil-andika fonts-sil-doulos geoclue-2.0 ghostscript gimp google-chrome insync kid3-qt lame libcurl4-openssl-dev libnotify-dev libreoffice openbox pandoc papirus-icon-theme plank pnmixer python-pip python2.7 python3 python3-venv python3-pip redshift-gtk ruby-full sakura spotify-client suru-icon-set texlive-extra-utils texlive-latex-extra texlive-xetex tex-gyre thunderbird tint2 tree vlc vlc-plugin-fluidsynth xcompmgr zotero zsh
+sudo apt install abcde arc-theme biber calibre cmus conky-all curl emacs26 evince eyed3 feh ffmpeg fonts-crosextra-carlito fonts-noto fonts-noto-color-emoji fonts-sil-andika fonts-sil-doulos geoclue-2.0 ghostscript gimp google-chrome insync kid3-qt lame libcurl4-openssl-dev libnotify-dev libreoffice maildir-utils mu4e offlineimap openbox pandoc papirus-icon-theme plank pnmixer python-pip python2.7 python3 python3-venv python3-pip redshift-gtk ruby-full sakura spotify-client suru-icon-set texlive-extra-utils texlive-latex-extra texlive-xetex tex-gyre thunderbird tint2 tree vlc vlc-plugin-fluidsynth xcompmgr zotero zsh
 # build-essential libsox-fmt-all sox xserver-xorg-core xserver-xlib-input-synaptics zlib1g-dev
 
 sudo apt update
@@ -51,15 +51,11 @@ git clone https://github.com/bhilburn/powerlevel9k.git ~/.oh-my-zsh/custom/theme
 git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
 
 # Download various packages from github
-mkdir -p ~/.gimp-2.8/scripts
+mkdir -p ~/.config/GIMP/2.10/scripts # updated filepath should work??
 curl https://api.github.com/repos/tshatrov/scriptfu/releases/latest | grep "browser_download_url.*scm" | cut -d : -f 2,3 | tr -d \" | wget -qi - 
-mv animstack.scm ~/.gimp-2.8/scripts/
+mv animstack.scm ~/.config/GIMP/2.10/scripts/
 
-# curl https://api.github.com/repos/getferdi/ferdi/releases/latest | grep "browser_download_url.*deb" | cut -d : -f 2,3 | tr -d \" | wget -qi - 
-# sudo dpkg -i ferdi*.deb
-# rm -f ferdi*.deb
-
-git clone https://github.com/Arkq/cmusfm.git
+git clone https://github.com/Arkq/cmusfm.git # currently installed version isn't working, will this one??
 cd cmusfm
 autoreconf --install
 mkdir build
@@ -72,9 +68,9 @@ rm -rf cmusfm # i *assume* this can be done before init
 cmusfm init
 echo Don’t forget to set it as a status display program
 
-mkdir -p ~/.zot
-curl https://api.github.com/repos/retorquere/zotero-better-bibtex/releases/latest | grep "browser_download_url.*xpi" | cut -d : -f 2,3 | tr -d \" | wget -qi -
-mv zotero-better-bibtex*.xpi ~/.zot/
+# mkdir -p ~/.zot
+# curl https://api.github.com/repos/retorquere/zotero-better-bibtex/releases/latest | grep "browser_download_url.*xpi" | cut -d : -f 2,3 | tr -d \" | wget -qi -
+# mv zotero-better-bibtex*.xpi ~/.zot/
 
 wget https://github.com/bBoxType/FiraSans/archive/master.zip
 unzip master.zip
@@ -147,6 +143,7 @@ rm -f ~/.config/pnmixer/config
 rm -f ~/.config/sakura/sakura.conf
 rm -f ~/.conkyrc
 rm -rf ~/.config/plank
+rm -f ~/mail.el ~/.offlineimaprc
 
 # Symlink config files from git repo
 ln -s ~/.linux/dots/.zshrc ~
@@ -172,6 +169,11 @@ ln -s ~/.linux/dots/.conkyrc ~
 mkdir -p ~/.config/plank/dock1/launchers
 cp ~/.linux/dots/plank/items/*.dockitem ~/.config/plank/dock1/launchers/
 cat ~/.linux/dots/plank/plank.ini | dconf load /net/launchpad/plank/docks/
+cp ~/.linux/dots/.offlineimaprc ~
+echo Need to set password for mu4e
+
+# Set up maildir-utils
+mu init
 
 # Set up .emacs.d (haven't tested this part)
 rm -f ~/.emacs