diff --git a/configuration.nix b/configuration.nix
index 2dee11b..6e9f524 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -210,14 +210,14 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    alejandra
     bitwarden-cli
     bitwarden-desktop
     cifs-utils
-    emacs-pgtk
     firefoxpwa
 	flashrom
     gcc
-    # nerd-fonts.blex-mono
+    nixd
     pciutils
     python3
     qemu
diff --git a/home/home.nix b/home/home.nix
index 3d7dbba..0ebdfdd 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -66,6 +66,11 @@
     ];
   };
 
+  programs.emacs = {
+    enable = true;
+    package = "pkgs.emacs-pgtk";
+  };
+
   programs.fastfetch = {
     enable = true;
 	settings = {
@@ -271,8 +276,8 @@
   };
 
   home.packages = with pkgs; [
-    audacity
     anki-bin
+    audacity
 	ffmpeg
 	gimp
 	ibm-plex
@@ -286,10 +291,20 @@
 	protonmail-bridge
 	thunderbird
 	ueberzugpp
+	vcv-rack
     runelite
   ];
 
-  services.mako.enable = true;
+  services.emacs = {
+    enable = true;
+    client = {
+      enable = true;
+      arguments = [
+        "-w"
+      ];
+    };
+    defaultEditor = true;
+  }
 
   services.mpd = {
     enable = true;