diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix
index 222784b..addef4e 100644
--- a/nix/configuration/flake.nix
+++ b/nix/configuration/flake.nix
@@ -10,11 +10,9 @@
     nixpkgs-b93b4e9b5.url = "github:NixOS/nixpkgs/b93b4e9b527904aadf52dba6ca35efde2067cbd4";
     home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    emacs-overlay.url = "github:nix-community/emacs-overlay/da2f552d133497abd434006e0cae996c0a282394";
-    emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-b93b4e9b5, impermanence, home-manager, emacs-overlay, ... }@inputs: let
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-b93b4e9b5, impermanence, home-manager, ... }@inputs: let
     base-system = {};
     odoqemu = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index a8c8f3d..4a6ada3 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -1,41 +1,68 @@
 { config, lib, pkgs, ... }:
 
-#let
-#  full-emacs = (pkgs.writeScriptBin "emacs" ''
-#      #! ${pkgs.bash}/bin/bash
-#      exec ${pkgs.emacs-gtk}/bin/emacs --init-directory ${./emacs.d} "$@"
-#    '');
-#in
+let
+  plainmacs = pkgs.writeShellScriptBin "plainmacs" ''
+INIT_SCRIPT=$(cat <<EOF
+(progn
+  (setq make-backup-files nil auto-save-default nil create-lockfiles nil)
+  (load-theme 'tango-dark t)
+  (set-face-attribute 'default nil :background "black")
+  ;; Bright yellow highlighting for selected region
+  (set-face-attribute 'region nil :background "#ffff50" :foreground "black")
+  ;; Bright green cursor to distinguish from yellow region
+  (set-cursor-color "#ccff66")
+  ;; Hightlight the current line
+  (set-face-attribute 'line-number-current-line nil :foreground "white")
+  ;; Set default font
+  (set-face-attribute 'default nil :height 100 :width 'regular :weight 'regular :family "Cascadia Mono")
+  ;; Set fallback font for unicode glyphs
+  (when (display-graphic-p)
+    (set-fontset-font "fontset-default" nil (font-spec :name "Noto Color Emoji")))
+  (menu-bar-mode -1)
+  (when (fboundp 'tool-bar-mode)
+    (tool-bar-mode -1))
+  (when (  fboundp 'scroll-bar-mode)
+    (scroll-bar-mode -1))
+  (pixel-scroll-precision-mode)
+  (setq frame-resize-pixelwise t)
+  )
+EOF
+)
+
+exec ${pkgs.emacs-gtk}/bin/emacs -q --eval "$INIT_SCRIPT" "''${@}"
+  '';
+in
 {
   imports = [];
 
   environment.systemPackages = with pkgs; [
-    #(pkgs.symlinkJoin {
-    #  name = "emacs";
-    #  paths = [
-    #    full-emacs
-    #    pkgs.emacs-gtk
-    #  ];
-    #})
-
-    #  (runCommand "default.el" {} ''
-    #     mkdir -p $out/share/emacs/site-lisp
-    #     cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
-    #   '')
+    plainmacs
+    emacs-gtk
+    clang # To compile tree-sitter grammars
   ];
 
+  home-manager.users.talexander = { pkgs, ... }: {
+    home.file.".config/emacs" = {
+      source = ./files/emacs;
+      recursive = true;
+    };
+  };
 
-  #environment.systemPackages = with pkgs; [
-  #  (pkgs.emacsWithPackagesFromUsePackage {
-  #    package = pkgs.emacsPgtkNativeComp;
-  #    config = path/to/your/config.el;
+  environment.persistence."/state" = {
+    hideMounts = true;
+    users.talexander = {
+      directories = [
+        ".config/emacs/eln-cache" # Installed packages
+        ".config/emacs/elpa" # Installed packages
+        ".config/emacs/private" # For recentf
+        ".config/emacs/tree-sitter" # Compiled tree-sitter grammars
+      ];
+      files = [
+        ".config/emacs/history" # For savehist
+        ".config/emacs/.last-package-update-day" # For use-package
+      ];
+    };
+  };
 
-  #    # Optionally provide extra packages not in the configuration file.
-  #    # extraEmacsPackages = epkgs: [
-  #    #   epkgs.use-package;
-  #    # ];
-  #  })
-  #];
-
-  #nixpkgs.overlays = [ (emacs-overlay) ];
+  environment.variables.EDITOR = "${plainmacs}/bin/plainmacs";
 }
diff --git a/nix/configuration/roles/emacs/emacs.d/early-init.el b/nix/configuration/roles/emacs/files/emacs/early-init.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/early-init.el
rename to nix/configuration/roles/emacs/files/emacs/early-init.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/base-extensions.el b/nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/base-extensions.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/base-extensions.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/base-functions.el b/nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/base-functions.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/base-functions.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/base-global-keys.el b/nix/configuration/roles/emacs/files/emacs/elisp/base-global-keys.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/base-global-keys.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/base-global-keys.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/base-theme.el b/nix/configuration/roles/emacs/files/emacs/elisp/base-theme.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/base-theme.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/base-theme.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/base.el b/nix/configuration/roles/emacs/files/emacs/elisp/base.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/base.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/base.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/common-lsp.el b/nix/configuration/roles/emacs/files/emacs/elisp/common-lsp.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/common-lsp.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/common-lsp.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-bash.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-bash.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-bash.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-bash.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-c.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-c.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-c.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-c.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-dockerfile.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-dockerfile.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-dockerfile.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-dockerfile.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-go.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-go.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-go.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-go.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-javascript.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-javascript.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-javascript.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-javascript.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-lua.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-lua.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-lua.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-lua.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-markdown.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-markdown.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-markdown.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-markdown.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-nix.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-nix.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-org.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-org.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-python.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-python.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-python.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-python.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-rust.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-rust.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-rust.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-rust.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-terraform.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-terraform.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-terraform.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-terraform.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-xml.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-xml.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-xml.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-xml.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/lang-yaml.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-yaml.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/lang-yaml.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/lang-yaml.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/util-flymake.el b/nix/configuration/roles/emacs/files/emacs/elisp/util-flymake.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/util-flymake.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/util-flymake.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/util-tree-sitter.el b/nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/util-tree-sitter.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/util-tree-sitter.el
diff --git a/nix/configuration/roles/emacs/emacs.d/elisp/util-vertico.el b/nix/configuration/roles/emacs/files/emacs/elisp/util-vertico.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/elisp/util-vertico.el
rename to nix/configuration/roles/emacs/files/emacs/elisp/util-vertico.el
diff --git a/nix/configuration/roles/emacs/emacs.d/init.el b/nix/configuration/roles/emacs/files/emacs/init.el
similarity index 100%
rename from nix/configuration/roles/emacs/emacs.d/init.el
rename to nix/configuration/roles/emacs/files/emacs/init.el