From 784926ce46d558226d41e4a0853b1b05eb1776e2 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Thu, 27 Feb 2025 21:49:20 -0600
Subject: [PATCH] emacs adjustments, path still broken

---
 flake.lock            | 34 ++++++++++------------------------
 flake.nix             |  5 ++++-
 modules/dev/emacs.nix |  5 ++---
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index 59e5ae8..874cc7d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -121,7 +121,7 @@
       "inputs": {
         "doomemacs": "doomemacs",
         "emacs-overlay": "emacs-overlay",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [],
         "systems": "systems"
       },
       "locked": {
@@ -772,16 +772,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740019556,
-        "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=",
-        "owner": "NixOS",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dad564433178067be1fbdfcce23b546254b6d641",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-lib": {
@@ -846,22 +848,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1739866667,
-        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixtendo-switch": {
       "inputs": {
         "flake-parts": "flake-parts_2",
@@ -958,7 +944,7 @@
         "hyprland": "hyprland",
         "jawz-scripts": "jawz-scripts",
         "nix-gaming": "nix-gaming",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-small": "nixpkgs-small",
         "nixpkgs11": "nixpkgs11",
         "nixtendo-switch": "nixtendo-switch",
diff --git a/flake.nix b/flake.nix
index fd1fc2a..01bd4af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,10 @@
     nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
     nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11";
     ucodenix.url = "github:e-tho/ucodenix";
-    doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened";
+    doom-emacs = {
+      url = "github:marienz/nix-doom-emacs-unstraightened";
+      inputs.nixpkgs.follows = "";
+    };
     jawz-scripts = {
       url = "git+ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/dev/emacs.nix b/modules/dev/emacs.nix
index 6660cb3..bab1a09 100644
--- a/modules/dev/emacs.nix
+++ b/modules/dev/emacs.nix
@@ -18,8 +18,8 @@
       enable = true;
       package = pkgs.emacsWithDoom {
         doomDir = ../../dotfiles/doom;
-        doomLocalDir = "$HOME/.local/share/nix-doom";
-        emacs = pkgs.emacs-gtk;
+        doomLocalDir = "/home/jawz/.local/share/nix-doom";
+        tangleArgs = "--all config.org";
         extraPackages =
           epkgs:
           let
@@ -70,6 +70,5 @@
       };
       defaultEditor = true;
     };
-    environment.variables.PATH = [ "\${XDG_CONFIG_HOME}/emacs/bin" ];
   };
 }