Skip to content

Commit

Permalink
Update move-doom-dir-paths-to-HOME.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
thiagokokada committed Oct 22, 2022
1 parent 1b3d1bd commit 9468602
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 43 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
*/
, dependencyOverrides ? { }
, lib, pkgs, stdenv, buildEnv, makeWrapper
, runCommand, fetchFromGitHub, substituteAll, writeShellScript
, runCommand, fetchFromGitHub, writeShellScript
, writeShellScriptBin, writeTextDir }:

assert (lib.assertMsg ((builtins.isPath doomPrivateDir)
Expand Down
13 changes: 0 additions & 13 deletions patches/fix-native-comp-eln-load-path.patch

This file was deleted.

32 changes: 3 additions & 29 deletions patches/move-doom-dir-paths-to-HOME.patch
Original file line number Diff line number Diff line change
@@ -1,31 +1,8 @@
From 9113cfb774b793fd1a0e0ab4ed7174c6f6b37986 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <[email protected]>
Date: Sat, 22 Oct 2022 12:15:58 +0100
Subject: [PATCH] Move doom-*-dir paths to HOME

---
lisp/doom.el | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/lisp/doom.el b/lisp/doom.el
index ce585080f..079ca3bb8 100644
index ce585080f..22b3de707 100644
--- a/lisp/doom.el
+++ b/lisp/doom.el
@@ -220,12 +220,7 @@ These files should not be shared across systems. By default, it is used by

(define-obsolete-variable-alias 'doom-etc-dir 'doom-data-dir "3.0.0")
(defvar doom-data-dir
- (if doom-profile
- (if IS-WINDOWS
- (expand-file-name "doomemacs/data/" (getenv-internal "APPDATA"))
- (expand-file-name "doom/" (or (getenv-internal "XDG_DATA_HOME") "~/.local/share")))
- ;; DEPRECATED: .local will be removed entirely in 3.0
- (file-name-concat doom-local-dir "etc/"))
+ "~/.local/share/doom/"
"Where Doom stores its global data files.

Data files contain shared and long-lived data that Doom, Emacs, and their
@@ -239,12 +234,7 @@ generated files for profiles, profiles themselves, autoloads/loaddefs, etc.
@@ -239,12 +239,7 @@ generated files for profiles, profiles themselves, autoloads/loaddefs, etc.
For profile-local data files, use `doom-profile-data-dir' instead.")

(defvar doom-cache-dir
Expand All @@ -39,7 +16,7 @@ index ce585080f..079ca3bb8 100644
"Where Doom stores its global cache files.

Cache files represent non-essential data that shouldn't be problematic when
@@ -258,12 +248,7 @@ session files, ELPA archives, authinfo files, org-persist, etc.
@@ -258,12 +253,7 @@ session files, ELPA archives, authinfo files, org-persist, etc.
For profile-local cache files, use `doom-profile-cache-dir' instead.")

(defvar doom-state-dir
Expand All @@ -53,6 +30,3 @@ index ce585080f..079ca3bb8 100644
"Where Doom stores its global state files.

State files contain non-essential, unportable, but persistent data which, if
--
2.37.3

0 comments on commit 9468602

Please sign in to comment.