Fix mu4e and re-enabled Treesitter

- Added ProtonMail account
- Added iCloud Mail account
- Remove Gmail account

bash/.bashrc

@@ -187,7 +187,6 @@ alias paths='echo -e ${PATH//:/\\n}' # path:         Echo all executable Paths
 alias userlist="cut -d: -f1 /etc/passwd | sort"
 alias ip='ip -color'
 alias stow='stow -d $DOTFILES '
-alias em='emacsclient -t'
 
 # User specific aliases and functions
 if [ -d ~/.bashrc.d ]; then

bash/.profile

@@ -15,8 +15,7 @@ export QT_STYLE_OVERRIDE=kvantum
 export QT_AUTO_SCREEN_SCALE_FACTOR=1
 
 export DOTFILES="$HOME/.dotfiles"
-export EDITOR="emacs -nw"
-export VISUAL="emacs"
+export EDITOR=nano
 
 # SSH socket
 export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
@@ -47,6 +46,8 @@ appendpath() {
   esac
 }
 
+# appendpath "/home/linuxbrew/.linuxbrew/bin"
 appendpath "$HOME/.local/bin"
 appendpath "$GOBIN"
+# appendpath "$HOME/.cargo/bin"
 unset appendpath

emacs/.emacs.d/init.el

@@ -19,7 +19,7 @@
  'tools/project
  'tools/lsp
  'tools/dap
- ;; 'tools/treesitter
+ 'tools/treesitter
 
  ;; Languages
  'lang/c

emacs/.emacs.d/lisp/core/ui.el

@@ -16,7 +16,7 @@
 (load-theme 'nordic-night t)
 
 ;; Setting default font
-(set-frame-font "UbuntuSansMono Nerd Font 16" nil t)
+(set-frame-font "UbuntuSansMono Nerd Font 14" nil t)
 
 ;; Remove toolbar
 (tool-bar-mode -1)

emacs/.emacs.d/lisp/misc/email.el

@@ -2,7 +2,7 @@
 
 (use-package mu4e
   :ensure nil
-  ;; :load-path "/usr/share/emacs/site-lisp/mu4e/"
+  :load-path "/usr/share/emacs/site-lisp/mu4e/"
   :defer 20 ; Wait until 20 seconds after startup
   :config
   ;; This is set to 't' to avoid mail syncing issues when using mbsync

emacs/.mbsyncrc

@@ -3,7 +3,7 @@ IMAPStore iCloud-remote
     Host imap.mail.me.com
     Port 993
     User fscottodisantolo@icloud.com
-    PassCmd "pass show icloud-mail"
+    PassCmd "secret-tool lookup icloud-mail icloud"
     AuthMechs *
     SSLType IMAPS
     SSLVersions TLSv1.2 TLSv1.3
@@ -27,7 +27,7 @@ IMAPStore protonmail-remote
     Host 127.0.0.1
     Port 1143
     User fscottodisantolo@protonmail.com
-    PassCmd "pass show protonmail-bridge"
+    PassCmd "secret-tool lookup protonmail-bridge protonmail"
     AuthMechs *
     SSLType STARTTLS
     PipelineDepth 1

git/.gitconfig

@@ -4,7 +4,6 @@
 [core]
   excludesfile = ~/.gitignore_global
   pager = delta
-  sshcommand = ssh.exe
 
 [user]
   name = Fabio Scotto di Santolo
@@ -25,6 +24,13 @@
 
 [merge]
   conflictstyle = diff3
+  tool = meld
+
+[mergetool]
+  prompt = false
+
+[diff]
+  tool = meld
 
 [color]
   ui = always
@@ -75,6 +81,3 @@
   colorMoved = default
   tabs = 4
   side-by-side = true
-
-[credential]
-  helper = manager-core