diff --git a/flake.lock b/flake.lock
index f94c9fd..6df7d79 100644
--- a/flake.lock
+++ b/flake.lock
@@ -333,11 +333,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753476892,
-        "narHash": "sha256-VZg9Oq9apTi2JEnlOSiCGl6iglwqNFr6A2u3CTWqGpQ=",
+        "lastModified": 1753479356,
+        "narHash": "sha256-fJZgp57I30SMZKwq2UQfGBkM4R7HqrZLde9YRUBe3dw=",
         "owner": "kylekrein",
         "repo": "emacs-config",
-        "rev": "1b0367dca5e6b37e2ca9c53f41f2316a5bf335eb",
+        "rev": "c256cbb11af63a3f5026ab4a9c427f51ef0d2dae",
         "type": "github"
       },
       "original": {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index d84eacd..56b2316 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -27,7 +27,6 @@ in {
       ./modules/services/autoupgrade
       ./modules/sops
       ./modules/dolphin
-      ./modules/emacs
       ./modules/gnupg
       ./modules/direnv
       ./hosts/${hwconfig.hostname}
diff --git a/nixos/homes/kylekrein/emacs.nix b/nixos/homes/kylekrein/emacs.nix
new file mode 100644
index 0000000..9f13a75
--- /dev/null
+++ b/nixos/homes/kylekrein/emacs.nix
@@ -0,0 +1,18 @@
+{
+  hwconfig,
+  inputs,
+  ...
+}: let
+  emacs = inputs.emacs-kylekrein.packages.${hwconfig.system}.with-lsps;
+in {
+  programs.emacs = {
+    enable = true;
+    package = emacs;
+  };
+  services.emacs = {
+    enable = true;
+    package = emacs;
+    startWithUserSession = true;
+    client.enable = true;
+  };
+}
diff --git a/nixos/homes/kylekrein/niri.nix b/nixos/homes/kylekrein/niri.nix
index 7f74c7d..95e8482 100644
--- a/nixos/homes/kylekrein/niri.nix
+++ b/nixos/homes/kylekrein/niri.nix
@@ -20,6 +20,7 @@
   imports = [
     ./waybar
     ./hyprlock.nix
+    ./emacs.nix
   ];
   home.packages = with pkgs;
     [
@@ -99,12 +100,12 @@
             "${../../modules/hyprland/wallpaper.jpg}"
           ];
         }
-        {
-          command = [
-            "emacs"
-            "--daemon"
-          ];
-        }
+        #{
+        #  command = [
+        #    "emacs"
+        #    "--daemon"
+        #  ];
+        #}
       ];
       layout = {
         preset-column-widths = [
diff --git a/nixos/modules/emacs/default.nix b/nixos/modules/emacs/default.nix
deleted file mode 100644
index ec66792..0000000
--- a/nixos/modules/emacs/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  inputs,
-  hwconfig,
-  ...
-}: let
-  emacs = inputs.emacs-kylekrein.packages.${hwconfig.system}.with-lsps;
-in {
-  services.emacs.enable = true;
-  services.emacs.startWithGraphical = true;
-  services.emacs.install = true;
-  services.emacs.package = emacs;
-
-  environment.systemPackages = [emacs];
-}
diff --git a/nixos/modules/emacs/packages.nix b/nixos/modules/emacs/packages.nix
deleted file mode 100644
index 9b4ea71..0000000
--- a/nixos/modules/emacs/packages.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  pkgs,
-  emacs,
-}: {
-  packages = with pkgs; [
-    git
-    gzip
-    wkhtmltopdf
-    zip
-    unzip
-    gnutar
-    libvterm
-    libtool
-    emacs
-    ripgrep
-    fd
-    ghostscript
-    coreutils
-    clang
-    cmake
-    nixfmt-rfc-style
-    markdownlint-cli
-    pandoc
-    groff
-    gnumake
-    python3
-    isort
-    pipenv
-    python313Packages.nose2
-    python313Packages.pytest
-    graphviz
-    shellcheck
-    nodejs_23
-
-    (pkgs.writeShellScriptBin "doom-install" ''
-      ${pkgs.git}/bin/git clone --depth 1 https://github.com/doomemacs/doomemacs ~/.emacs.d
-      ${pkgs.git}/bin/git clone https://github.com/KyleKrein/doomemacs.git ~/.doom.d
-      ~/.emacs.d/bin/doom install
-      ~/.emacs.d/bin/doom sync
-      pidof emacs || ${emacs}/bin/emacs --daemon &
-    '')
-    (pkgs.writeShellScriptBin "doom-sync" ''
-      ~/.emacs.d/bin/doom sync --aot --force
-    '')
-    (pkgs.writeShellScriptBin "doom-upgrade" ''
-      ~/.emacs.d/bin/doom upgrade
-    '')
-    (pkgs.writeShellScriptBin "doom" ''
-      ${emacs}/bin/emacsclient -c -a "${emacs}/bin/emacs"
-    '')
-  ];
-}
diff --git a/nixos/wsl.nix b/nixos/wsl.nix
index d109816..49c4d08 100644
--- a/nixos/wsl.nix
+++ b/nixos/wsl.nix
@@ -12,7 +12,6 @@
     [
       ./modules/firefox
       ./modules/flatpak
-      ./modules/emacs
       ./modules/gnupg
       ./modules/direnv
       ./hosts/${hwconfig.hostname}
@@ -39,6 +38,7 @@
   };
   users.extraGroups.docker.members = ["nixos"];
   environment.systemPackages = with pkgs; [
+    inputs.emacs-kylekrein.packages.${pkgs.system}.with-lsps-native
     killall
     nix-output-monitor
     eza