diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index 49e221f2..2f94e7bc 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -56,7 +56,7 @@ let
   daily-driver = name: extra:
     let
       all = extra ++ on-my-machines ++ [
-        (import ./roles/firefox.nix "http://localhost:8842")
+        (import ./roles/firefox.nix "http://localhost:7000")
         (makeAutostart "kassandra2")
         (makeAutostart "unlock-ssh")
         ./roles/beets.nix
@@ -74,6 +74,7 @@ let
         ./roles/night-shutdown.nix
         ./roles/tinkering.nix
         ./roles/wallpaper.nix
+        ./roles/zettelkasten.nix
       ];
       orgaExtra = [
         ./roles/accounting.nix
diff --git a/home-manager/roles/hotkeys.nix b/home-manager/roles/hotkeys.nix
index 3ef38b9b..eff05520 100644
--- a/home-manager/roles/hotkeys.nix
+++ b/home-manager/roles/hotkeys.nix
@@ -60,6 +60,17 @@ in
       };
     };
   }
+  {
+    Apps = {
+      Editor = fork "codium";
+      Files = fork "nautilus";
+      DarkKitty = fork "kitty -o 'background #000000' -o 'foreground #ffffff'";
+      Games = {
+        Steam = fork "steam";
+        Minecraft = fork "minecraft-launcher";
+      };
+    };
+  }
   {
     Web = {
       Browser = fork "firefox";
@@ -71,7 +82,6 @@ in
       VoxMachina = fork "mpv https://www.youtube.com/playlist?list=PL1tiwbzkOjQz7D0l_eLJGAISVtcL7oRu_";
     };
   }
-  { Files = fork "nautilus"; }
   { Passmenu = "pass clip -f"; }
   { "Select Mode" = "select-mode"; }
   {
@@ -106,11 +116,4 @@ in
       Close = "ssh door@burbon.w17.io close";
     };
   }
-  { DarkKitty = fork "kitty -o 'background #000000' -o 'foreground #ffffff'"; }
-  {
-    Games = {
-      Steam = fork "steam";
-      Minecraft = fork "minecraft-launcher";
-    };
-  }
 ]
diff --git a/home-manager/roles/tinkering.nix b/home-manager/roles/tinkering.nix
index 5b48542d..438a6ce9 100644
--- a/home-manager/roles/tinkering.nix
+++ b/home-manager/roles/tinkering.nix
@@ -28,7 +28,6 @@
       jnoortheen.nix-ide
       pkief.material-icon-theme
       yzhang.markdown-all-in-one
-      davidlday.languagetool-linter
       justusadam.language-haskell
       naumovs.color-highlight
       timonwong.shellcheck
@@ -39,7 +38,7 @@
     ];
     userSettings = {
       "editor.fontFamily" = "JetBrainsMono Nerd Font, monospace";
-      "files.autoSave" = "onFocusChange";
+      "files.autoSave" = "afterDelay";
       "editor.tabSize" = 3;
       "editor.fontLigatures" = true;
       "workbench.colorTheme" = "Default Light+";
@@ -50,6 +49,8 @@
       "extensions.autoUpdate" = false;
       "extensions.autoCheckUpdates" = false;
       "local-history.path" = "~/.volatile/vscode-local-history/";
+      "projectManager.git.baseFolders" = [ "~/git/" ];
+      "ltex.enabled" = false;
       "memo.links.rules" = [
         {
           "rule" = "\\.md$";
diff --git a/home-manager/roles/zettelkasten.nix b/home-manager/roles/zettelkasten.nix
index 0e3e6780..839af2c5 100644
--- a/home-manager/roles/zettelkasten.nix
+++ b/home-manager/roles/zettelkasten.nix
@@ -1,15 +1,16 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 let
-  notesDir = "${config.home.homeDirectory}/git/zettelkasten";
-  cmd = "${pkgs.myHaskellPackages.neuron}/bin/neuron -d ${notesDir} rib -w -s 127.0.0.1:8002";
+  emanote = import (import ../../nix/sources.nix).emanote;
 in
 {
-  systemd.user.services.neuron = {
-    Unit.Description = "Neuron zettelkasten service";
-    Install.WantedBy = [ "graphical-session.target" ];
-    Service = {
-      ExecStart = cmd;
-      Restart = "always";
-    };
+  imports = [ emanote.homeManagerModule ];
+  services.emanote = {
+    enable = true;
+    # host = "127.0.0.1"; # default listen address is 127.0.0.1
+    # port = 7000;        # default http port is 7000
+    notes = [
+      "${config.home.homeDirectory}/git/notes/content" # add as many layers as you like
+    ];
+    package = emanote.defaultPackage.${builtins.currentSystem};
   };
 }
diff --git a/nix/sources.json b/nix/sources.json
index a76e4391..9d1a7a0a 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,4 +1,16 @@
 {
+    "emanote": {
+        "branch": "master",
+        "description": "Spiritual successor to neuron, based on Ema.",
+        "homepage": "https://emanote.srid.ca",
+        "owner": "srid",
+        "repo": "emanote",
+        "rev": "c82d5e1b573a7bf1300b2b48090ae9d5ac1ce635",
+        "sha256": "0yp7k9gn20p6gv7hgfb3f7kj7zjgwk356hia26gxq2ay7ihddqk4",
+        "type": "tarball",
+        "url": "https://github.com/srid/emanote/archive/c82d5e1b573a7bf1300b2b48090ae9d5ac1ce635.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "haskell-dialog": {
         "branch": "main",
         "repo": "git@hera.m-0.eu:haskell-dialog",