diff --git a/flake.lock b/flake.lock
index 1955245..c2097c8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -110,6 +110,29 @@
         "type": "github"
       }
     },
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1749173328,
+        "narHash": "sha256-f7rMoP369fUDu9WlI1v+Q3SivvXmL2IcNPdn+g9yaTc=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "4057e1fcd998c653be0db421a3fb268e28d17d8f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -420,6 +443,7 @@
         "agenix": "agenix",
         "chaotic": "chaotic",
         "disko": "disko",
+        "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "niri": "niri",
diff --git a/flake.nix b/flake.nix
index 5f9457c..1324c5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
+
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
+    };
   };
 
   outputs =
diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix
index 3363777..1cd0697 100644
--- a/home-manager/no-gui.nix
+++ b/home-manager/no-gui.nix
@@ -44,6 +44,18 @@ let
     typescript-language-server # typescript lsp
     cmake-language-server # cmake lsp
   ];
+
+
+  # Praise be to the church of emacs
+  emacs_stuff = with pkgs; [
+    emacs-unstable
+
+    # shell check things
+    shellcheck
+
+    # for search
+    fd
+  ];
 in
 {
   imports = [
@@ -55,13 +67,13 @@ in
       {
         nixpkgs.overlays = [
           inputs.rust-overlay.overlays.default
+          inputs.emacs-overlay.overlays.default
         ];
       }
     )
   ];
 
-  home.stateVersion = "24.11";
-  home.enableNixpkgsReleaseCheck = false;
+  home.stateVersion = "25.11";
 
   home.packages =
     with pkgs;
@@ -97,6 +109,10 @@ in
       ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg`
       lurk # better strace
 
+
+      # alternative to `find`
+      fd
+
       # adds `sensors` command
       lm_sensors
 
@@ -188,7 +204,8 @@ in
       jasmin
     ]
     ++ rust_pkgs
-    ++ lsps;
+    ++ lsps
+    ++ emacs_stuff;
 
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''
diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix
index 6df7a0b..bd3ad1c 100644
--- a/home-manager/progs/fish.nix
+++ b/home-manager/progs/fish.nix
@@ -49,6 +49,7 @@ in
     shellInit = ''
       fish_add_path ~/.local/bin
       fish_add_path ~/.cargo/bin
+      fish_add_path ~/.config/emacs/bin
       set hydro_color_pwd 62A
       set hydro_color_error red
       set hydro_color_duration yellow