diff --git a/flake.nix b/flake.nix
index 0827d49..fc74897 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,14 @@
       nixosConfigurations.eagle = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
+          ({ config, pkgs, ... }: {
+            nixpkgs.overlays = [
+              (import (builtins.fetchTarball {
+                url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+                sha256 = "05941qsk7138ylfpzqcqcgrpjw0jnyh2r1q6nhyh7n3d5q00hc8b";
+              }))
+            ];
+          })
           ./hosts/eagle
 
           home-manager.nixosModules.home-manager
diff --git a/users/carsten/conf/doom/config.el b/users/carsten/conf/doom/config.el
index ff4e341..6045262 100644
--- a/users/carsten/conf/doom/config.el
+++ b/users/carsten/conf/doom/config.el
@@ -32,6 +32,7 @@
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
+(add-to-list 'custom-theme-load-path (concat (getenv "HOME") "/source/ctp-emacs"))
 (setq doom-theme 'catppuccin)
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
@@ -73,3 +74,14 @@
 ;;
 ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
 ;; they are implemented.
+
+(defun ctp/org-heading-colors ()
+  (face-remap-add-relative 'org-level-1 (list :foreground (catppuccin-get-color 'blue)))
+  (face-remap-add-relative 'org-level-2 (list :foreground (catppuccin-get-color 'red)))
+  (face-remap-add-relative 'org-level-3 (list :foreground (catppuccin-get-color 'green)))
+  (face-remap-add-relative 'org-level-4 (list :foreground (catppuccin-get-color 'lavender)))
+  (face-remap-add-relative 'org-level-5 (list :foreground (catppuccin-get-color 'yellow)))
+  (face-remap-add-relative 'org-level-6 (list :foreground (catppuccin-get-color 'maroon)))
+  (face-remap-add-relative 'org-level-7 (list :foreground (catppuccin-get-color 'teal)))
+  (face-remap-add-relative 'org-level-8 (list :foreground (catppuccin-get-color 'mauve))))
+(add-hook! 'org-mode-hook 'ctp/org-heading-colors)
diff --git a/users/carsten/conf/doom/init.el b/users/carsten/conf/doom/init.el
index bae9f8b..cff601c 100644
--- a/users/carsten/conf/doom/init.el
+++ b/users/carsten/conf/doom/init.el
@@ -172,7 +172,7 @@
        ;;solidity          ; do you need a blockchain? No.
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
-       ;;web               ; the tubes
+       web               ; the tubes
        yaml              ; JSON, but readable
        ;;zig               ; C, but simpler
 
diff --git a/users/carsten/conf/doom/packages.el b/users/carsten/conf/doom/packages.el
index fcd117d..a39a993 100644
--- a/users/carsten/conf/doom/packages.el
+++ b/users/carsten/conf/doom/packages.el
@@ -48,5 +48,4 @@
 ;(unpin! pinned-package another-pinned-package)
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;(unpin! t)
-(package! catppuccin-theme)
 (package! meson-mode)
diff --git a/users/carsten/conf/emacs.nix b/users/carsten/conf/emacs.nix
index 7feda99..416b816 100644
--- a/users/carsten/conf/emacs.nix
+++ b/users/carsten/conf/emacs.nix
@@ -20,6 +20,7 @@
             ${config.xdg.configHome}/emacs/bin/doom install
           else
             ${config.xdg.configHome}/emacs/bin/doom sync -u -e
+            ${config.xdg.configHome}/emacs/bin/doom env -a SSH_AUTH_SOCK
           fi
       ''}";
     };
@@ -38,6 +39,7 @@
             ${config.xdg.configHome}/emacs/bin/doom install
           else
             ${config.xdg.configHome}/emacs/bin/doom sync -u -e
+            ${config.xdg.configHome}/emacs/bin/doom env -a SSH_AUTH_SOCK
           fi
         ''}";
     };
diff --git a/users/carsten/pkgs/default.nix b/users/carsten/pkgs/default.nix
index 1f1db7c..bf9c291 100644
--- a/users/carsten/pkgs/default.nix
+++ b/users/carsten/pkgs/default.nix
@@ -4,7 +4,7 @@
   programs.bash.enable = true;
   programs.emacs = {
     enable = true;
-    package = pkgs.emacs;
+    package = pkgs.emacsGit;
     extraPackages = epkgs: [
       epkgs.vterm
       epkgs.pdf-tools
@@ -43,5 +43,6 @@
 
     # language-servers
     rust-analyzer
+    nodePackages.javascript-typescript-langserver
   ];
 }