diff --git a/flake.lock b/flake.lock
index 39cb595..7f7e01b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -123,30 +123,9 @@
       }
     },
     "emacs": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1732638272,
-        "narHash": "sha256-GVU6mT/HDC7DRWYgyrJw2c23PGnb7nAWoVbc3JtbCoo=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "31dd8e842483b14a334409530b966a196c52f254",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "type": "github"
-      }
-    },
-    "emacs_2": {
       "inputs": {
         "nixpkgs": "nixpkgs_5",
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
         "lastModified": 1732583978,
@@ -1043,7 +1022,7 @@
     },
     "nixpkgs-f2k": {
       "inputs": {
-        "emacs": "emacs_2",
+        "emacs": "emacs",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -1189,22 +1168,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1731797254,
-        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-wayland": {
       "inputs": {
         "flake-compat": "flake-compat_5",
@@ -1398,7 +1361,6 @@
         "agenix": "agenix",
         "darwin": "darwin",
         "determinate": "determinate",
-        "emacs": "emacs",
         "home": "home",
         "master": "master",
         "nil": "nil",
diff --git a/flake.nix b/flake.nix
index ad07f39..b221907 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,6 @@
   inputs = {
     # Flake inputs
     agenix.url = "github:ryantm/agenix";
-    emacs.url = "github:nix-community/emacs-overlay";
     darwin.url = "github:lnl7/nix-darwin";
     determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
     home.url = "github:nix-community/home-manager";
@@ -51,7 +50,6 @@
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     agenix.inputs.darwin.follows = "darwin";
     darwin.inputs.nixpkgs.follows = "nixpkgs";
-    emacs.inputs.nixpkgs.follows = "nixpkgs";
     home.inputs.nixpkgs.follows = "nixpkgs";
     nix.inputs.nixpkgs.follows = "nixpkgs";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/parts/default.nix b/modules/parts/default.nix
index 24b2703..0c7b5ed 100644
--- a/modules/parts/default.nix
+++ b/modules/parts/default.nix
@@ -37,7 +37,6 @@
           hostPlatform = system;
 
           overlays = lib.mkForce [
-            inputs.emacs.overlay
             inputs.nixpkgs-f2k.overlays.stdenvs
             self.overlays.default
           ];
diff --git a/modules/shared/nixos/default.nix b/modules/shared/nixos/default.nix
index 2ebc21a..2a031e6 100644
--- a/modules/shared/nixos/default.nix
+++ b/modules/shared/nixos/default.nix
@@ -146,7 +146,6 @@
   fonts = {
     packages = __attrValues {
       inherit (pkgs)
-        emacs-all-the-icons-fonts
         fantasque-sans-mono
         # NOTE: use only when current is outdated
         # iosevka-ft