diff --git a/dotfiles/dot_default-npm-packages b/dotfiles/dot_default-npm-packages
new file mode 100644
index 0000000..a20aee9
--- /dev/null
+++ b/dotfiles/dot_default-npm-packages
@@ -0,0 +1,10 @@
+corepack
+javascript-typescript-langserver
+npm
+prettier
+stylelint-config-standard-scss
+stylelint
+svelte-language-server
+typescript-language-server
+typescript
+vscode-langservers-extracted
diff --git a/dotfiles/dot_gitconfig b/dotfiles/dot_gitconfig
new file mode 100644
index 0000000..c35c35f
--- /dev/null
+++ b/dotfiles/dot_gitconfig
@@ -0,0 +1,17 @@
+# This is Git's per-user configuration file.
+[user]
+# Please adapt and uncomment the following lines:
+	name = Matt Nish-Lapidus
+	email = matt@emenel.ca
+[core]
+	editor = emacsclient
+	excludesfile = /Users/emenel/.gitignore
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[pull]
+	rebase = false
+[init]
+	defaultBranch = main
diff --git a/dotfiles/dot_gitignore b/dotfiles/dot_gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/dotfiles/dot_gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/dotfiles/dot_mbsyncrc b/dotfiles/dot_mbsyncrc
new file mode 100644
index 0000000..7d3462f
--- /dev/null
+++ b/dotfiles/dot_mbsyncrc
@@ -0,0 +1,55 @@
+IMAPAccount emenel-fastmail
+Host imap.fastmail.com
+User matt@emenel.ca
+PassCmd "security find-generic-password -s mu4e-mattemenel-fastmail -a matt@emenel.ca -w"
+Port 993
+TLSType IMAPS
+AuthMechs Login
+CertificateFile ~/.maildir/certificates/root-certificates.pem
+
+IMAPStore emenel-fastmail-remote
+Account emenel-fastmail
+
+MaildirStore emenel-fastmail-local
+SubFolders Verbatim
+Path ~/.maildir/matt@emenel.ca/
+Inbox ~/.maildir/matt@emenel.ca/INBOX
+
+Channel emenel-fastmail
+Far :emenel-fastmail-remote:
+Near :emenel-fastmail-local:
+Patterns *
+Create Near
+Sync All
+Expunge Both
+SyncState *
+
+#######
+
+IMAPAccount admin-studyoftime
+Host imap.dreamhost.com
+User admin@studyoftime.org
+PassCmd "security find-generic-password -s mu4e-studyoftime -w"
+Port 993
+TLSType IMAPS
+AuthMechs Login
+CertificateFile ~/.maildir/certificates/root-certificates.pem
+
+IMAPStore admin-studyoftime-remote
+Account admin-studyoftime
+
+MaildirStore admin-studyoftime-local
+SubFolders Verbatim
+Path ~/.maildir/admin@studyoftime.org/
+Inbox ~/.maildir/admin@studyoftime.org/INBOX
+
+Channel admin-studyoftime
+Far :admin-studyoftime-remote:
+Near :admin-studyoftime-local:
+Patterns *
+Create Near
+Sync All
+Expunge Both
+SyncState *
+
+#######
diff --git a/dotfiles/dot_msmtprc b/dotfiles/dot_msmtprc
new file mode 100644
index 0000000..ff26939
--- /dev/null
+++ b/dotfiles/dot_msmtprc
@@ -0,0 +1,32 @@
+# Set default values for all the accounts.
+defaults
+logfile ~/.maildir/msmtp.log
+tls_trust_file ~/.maildir/certificates/root-certificates.pem
+
+account fastmail
+auth on
+host smtp.fastmail.com
+port 465
+protocol smtp
+from matt@emenel.ca
+user matt@emenel.ca
+passwordeval security find-generic-password -s "mu4e-mattemenel-fastmail" -w
+tls on
+tls_starttls off
+
+# ====
+
+account isst
+auth on
+host smtp.dreamhost.com
+port 465
+protocol smtp
+from admin@studyoftime.org
+user admin@studyoftime.org
+passwordeval security find-generic-password -s "mu4e-studyoftime" -w
+tls on
+tls_starttls off
+
+# ======================================================================
+
+account default : fastmail
diff --git a/dotfiles/dot_sbclrc b/dotfiles/dot_sbclrc
new file mode 100644
index 0000000..e947043
--- /dev/null
+++ b/dotfiles/dot_sbclrc
@@ -0,0 +1,9 @@
+
+;;; The following lines added by ql:add-to-init-file:
+#-quicklisp
+(let ((quicklisp-init (merge-pathnames "~/.quicklisp/setup.lisp"
+                                       (user-homedir-pathname))))
+  (when (probe-file quicklisp-init)
+    (load quicklisp-init)))
+
+(push (pathname "~/Source/_cl/") ql:*local-project-directories*)
diff --git a/dotfiles/dot_signature b/dotfiles/dot_signature
new file mode 100644
index 0000000..2ce8429
--- /dev/null
+++ b/dotfiles/dot_signature
@@ -0,0 +1,2 @@
+Matt Nish-Lapidus
+https://emenel.ca
diff --git a/home/home.nix b/home/home.nix
index 404bf0c..b9548e6 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -153,7 +153,7 @@
   };
 
   xdg.configFile."emacs".enable = false;
-  #home.file.".config/doom".enable = true; 
-  #home.file.".config/doom".recursive = true;
-  #home.file.".config/doom".source = ../dotfiles/dot_config/doom;
+  
+  home.file.".mbsynrc".src = ../dotfiles/dot_mbsyncrc;
+
 }
diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix
index b15c2bc..74dac54 100644
--- a/system/eddie/configuration.nix
+++ b/system/eddie/configuration.nix
@@ -132,7 +132,7 @@
 
   services.emacs = {
     enable = true;
-    package = pkg.emacs;
+    package = pkgs.emacs;
   };
 
   # Enable sound with pipewire.
@@ -192,6 +192,7 @@
     rsync
     #kanata
     kmonad
+    emacs
   ];
 
   #systemd.services.kanata = {