diff --git a/flake.lock b/flake.lock
index acd12c9..559029a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773422513,
-        "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=",
+        "lastModified": 1775762219,
+        "narHash": "sha256-e7BhggoWhg3Ok7dDI5kY1XZzORBQc0Rclcs3IWzux3w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056",
+        "rev": "c975a66a56306b38eaa3108f54bbc11e213f42f6",
         "type": "github"
       },
       "original": {
@@ -65,11 +65,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772945408,
-        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
+        "lastModified": 1775365369,
+        "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
+        "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
         "type": "github"
       },
       "original": {
diff --git a/home.org b/home.org
index b316c20..826a529 100644
--- a/home.org
+++ b/home.org
@@ -12,10 +12,7 @@ in a ~nix~ devshell I think I'd also like to use it for scripting / exploratory
 so I'm installing it globally with a useful set of libraries. I should curate this somewhat
 carefully so it doesn't get carried away...
 
-I'm skipping tangling this for now. It increases the update time a lot, and I'm not sure it's really
-necessary.
-
-#+BEGIN_SRC nix
+#+BEGIN_SRC nix :tangle target/base/sbcl.nix
   {pkgs, ...}:
   {
     home.packages = with pkgs; [
@@ -29,6 +26,7 @@ necessary.
         clack-handler-woo
         dbd-mysql
         dbi
+        defstar
         dexador
         fare-csv
         group-by
@@ -49,6 +47,7 @@ necessary.
         str
         sxql-composer
         trivia
+        trivial-mmap
         trivial-ws
         trivial-open-browser
         trivial-timeout
@@ -140,7 +139,6 @@ are still Shibumi-specific; ideally I'd find another way to install them.
      home.packages = with pkgs; [
        aws-iam-authenticator
        awscli2
-       iosevka
        kube
        kubectl
        mariadb.client
@@ -160,9 +158,11 @@ These programs require a full desktop environment:
   {
     home.packages = with pkgs; [
       google-chrome
+      (iosevka-bin.override { variant = "Aile"; })
+      (iosevka-bin.override { variant = "Etoile"; })
+      (iosevka-bin.override { variant = "SGr-IosevkaTerm"; })
       keymapp
       proton-pass
-      protonmail-desktop
       slack
       wireshark
     ];
@@ -949,7 +949,7 @@ content to be.
                "\\*EGLOT connections\\*"
                "\\*trace-output\\*"
                "\\*occur\\*"
-               "*eshell\\*")
+               ".*eshell\\*")
              (display-buffer-in-side-window)
              (side . bottom)
              (slot . 0)
@@ -965,7 +965,8 @@ content to be.
                  "\\*slack: .*"
                  "\\*forge: .*"
                  "new-pullreq"
-                 "\\*claude:.*")
+                 "\\*claude:.*"
+                 "\\*Man .*")
              (display-buffer-reuse-window display-buffer-in-side-window)
              (side . right)
              (slot . 0)
@@ -1198,6 +1199,7 @@ available? It seems to work for now anyway...
              ("C-c a" . eglot-code-actions)
              ("C-c r" . eglot-rename)
              ("C-c i" . eglot-find-implementation))
+  (add-to-list  'eglot-stay-out-of 'yasnippet)
 
   (setopt ediff-split-window-function 'split-window-horizontally)
 
@@ -1474,7 +1476,8 @@ available? It seems to work for now anyway...
   (setopt corfu-popupinfo-mode nil)
   (setopt corfu-quit-at-boundary nil)
   (setopt corfu-on-exact-match 'show)
-  (global-corfu-mode)
+  ;; (global-corfu-mode)
+  (setq completion-in-region-function #'consult-completion-in-region)
 
   ;; Consult users will also want the embark-consult package.
   (add-hook 'embark-collect-mode-hook 'consult-preview-at-point-mode)
@@ -1516,7 +1519,7 @@ available? It seems to work for now anyway...
           org-capture-templates
           '(("t" "Todo" entry
              (here)
-             "** TODO %?\n- State \"TODO\" %U\n")
+             "** TODO %?\n:LOGBOOK:\n- State \"TODO\" %U\n:END:\n")
             ("w" "Work stuff")
             ("wp" "Work Project" entry
              (file+headline "~/org/todo/work.org.age" "Next Actions")
@@ -1531,7 +1534,7 @@ available? It seems to work for now anyway...
             ("pa" "Personal Next Action" entry
              (file+headline "~/org/todo/personal.org.age" "Next Actions")
              "*** TODO %?\n- State \"TODO\" %U\n"))
-          org-agenda-files '("~/org/todo/work.org.age" "~/org/todo/personal.org.age")
+          org-agenda-files '("~/org/todo/work.org" "~/org/todo/personal.org.age")
           org-agenda-todo-ignore-scheduled 'future
           org-agenda-tags-todo-honor-ignore-options t
           org-enforce-todo-dependencies t
@@ -1838,7 +1841,7 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
 #+END_SRC
 
 ** Wezterm
-#+BEGIN_SRC lua :tangle target/base/wezterm.lua
+#+BEGIN_SRC lua :tangle target/desktop/wezterm.lua
   config.color_scheme = 'Catppuccin Frappe'
 
   return config
@@ -1868,7 +1871,7 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
 
   ;; (set-face-attribute 'default nil :font "JetBrainsMono Nerd Font" :height 130)
   ;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130)
-  (set-face-attribute 'default nil :font "Iosevka" :height 130 :width 'expanded)
-  (set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 130 :width 'expanded)
+  (set-face-attribute 'default nil :font "Iosevka Term" :height 130 :width 'expanded)
+  (set-face-attribute 'fixed-pitch nil :font "Iosevka Term" :height 130 :width 'expanded)
   (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height 130)
 #+END_SRC