[emacs] Remove doom-emacs-unstraightened

home/modules/emacs/default.nix

@@ -2,10 +2,21 @@
 
 with lib;
 
+let
+  doomEmacs = pkgs.fetchFromGitHub {
+    owner = "doomemacs";
+    repo = "doomemacs";
+    rev = "009a285c0a63c305d0aa89f46122b7f98a57e897";
+    sha256 = "sha256-DDEVz/3zm//4CieuYYvKHvnDNccOMcApV1vYrWXIgGI=";
+  };
+in
 {
   config = {
     home.packages = [
+      pkgs.emacs
+
       pkgs.emacs-all-the-icons-fonts
+      pkgs.fira-code
       pkgs.fontconfig
       pkgs.graphviz
       pkgs.isort
@@ -19,15 +30,19 @@ with lib;
       pkgs.python3
     ];
 
-    programs.doom-emacs = {
-      enable = true;
-      doomDir = ./doom;
-    };
-
     fonts.fontconfig.enable = true;
 
+    home.file."${config.xdg.configHome}/emacs".source = doomEmacs;
+    home.sessionPath = [
+      "${config.xdg.configHome}/emacs/bin"
+    ];
+
     home.sessionVariables = {
-      EDITOR = "emacs -nw";
+      DOOMDIR = "${config.xdg.configHome}/doom";
+      DOOMLOCALDIR = "${config.xdg.dataHome}/doom";
+      DOOMPROFILE = "default";
     };
+
+    home.file."${config.xdg.configHome}/doom".source = ./doom;
   };
 }

home/modules/emacs/doom/init.el

@@ -108,7 +108,7 @@
 
        :os
        (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
-       ;;tty               ; improve the terminal Emacs experience
+       tty               ; improve the terminal Emacs experience
 
        :lang
        ;;agda              ; types of types of types of types...