diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 1d99a9c..a08062b 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -228,6 +228,7 @@
     font-awesome
     hack-font
     corefonts
+    nerd-fonts.symbols-only
     vistafonts
   ];
   environment.sessionVariables = {
@@ -372,8 +373,16 @@
     settings = {
       experimental-features = ["nix-command" "flakes"];
       auto-optimise-store = true;
-      substituters = ["https://hyprland.cachix.org" "https://nix-gaming.cachix.org"];
-      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="];
+      substituters = [
+        "https://hyprland.cachix.org"
+        "https://nix-gaming.cachix.org"
+        "https://nix-community.cachix.org"
+      ];
+      trusted-public-keys = [
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
     };
   };
 }
diff --git a/nixos/modules/emacs/default.nix b/nixos/modules/emacs/default.nix
index 7cc3647..6d7c7d2 100644
--- a/nixos/modules/emacs/default.nix
+++ b/nixos/modules/emacs/default.nix
@@ -5,7 +5,7 @@
   inputs,
   ...
 }: let
-  emacs = pkgs.emacs;
+  emacs = pkgs.emacs;#pkgs.emacs-pgtk;
 in {
   services.emacs.enable = true;
   services.emacs.startWithGraphical = true;
@@ -14,11 +14,26 @@ in {
 
   environment.systemPackages = with pkgs; [
     git
+    libvterm
+    libtool
     emacs
     ripgrep
     fd
     coreutils
     clang
+    cmake
+    nixfmt-rfc-style
+    markdownlint-cli
+    pandoc
+    gnumake
+    python3
+    isort
+    pipenv
+    python313Packages.nose2
+    python313Packages.pytest
+    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
@@ -33,7 +48,7 @@ in {
       ~/.emacs.d/bin/doom upgrade
     '')
     (pkgs.writeShellScriptBin "doom" ''
-      ${emacs}/bin/emacsclient -c
+      ${emacs}/bin/emacsclient -c -a "${emacs}/bin/emacs"
     '')
   ];
   nixpkgs.overlays = [
diff --git a/nixos/modules/hyprland/hyprland.nix b/nixos/modules/hyprland/hyprland.nix
index e2aa035..afa8137 100644
--- a/nixos/modules/hyprland/hyprland.nix
+++ b/nixos/modules/hyprland/hyprland.nix
@@ -122,6 +122,8 @@ in {
 
         "$mainMod, P, exec, $makeRegionScreenshot"
         "$mainMod ALT, L, exec, ${pkgs.hyprlock}/bin/hyprlock"
+
+        ''$mainMod, E, exec, emacsclient -c -a "send-notify 'Unable to launch Emacs. Daemon is not running'"''
       ];
 
       bindm = [