Merge pull request #332 from hab25/master

Fix incomplete `Info-directory-list`
This commit is contained in:
Thiago Kenji Okada
2022-11-06 10:47:27 +00:00
committed by GitHub
3 changed files with 13 additions and 2 deletions

View File

@ -217,7 +217,7 @@ let
chmod u+w $out/config.el chmod u+w $out/config.el
cat $extraConfigPath > $out/config.extra.el cat $extraConfigPath > $out/config.extra.el
cat > $out/config.el << EOF cat > $out/config.el << EOF
(load "${./workarounds.el}") (load "${./doom-modeline-workarounds.el}")
(load "${doomPrivateDir}/config.el") (load "${doomPrivateDir}/config.el")
(load "$out/config.extra.el") (load "$out/config.extra.el")
EOF EOF
@ -234,6 +234,7 @@ let
''} ''}
(load "${doom-emacs}/lisp/doom.el") (load "${doom-emacs}/lisp/doom.el")
(load "${doom-emacs}/lisp/doom-start.el") (load "${doom-emacs}/lisp/doom-start.el")
(load "${./info-workarounds.el}")
''; '';
in (emacsPackages.emacsWithPackages (epkgs: [ load-config-from-site ])); in (emacsPackages.emacsWithPackages (epkgs: [ load-config-from-site ]));

View File

@ -1,4 +1,4 @@
;;; workarounds.el --- Description -*- lexical-binding: t; -*- ;;; doom-modeline-workarounds.el --- Description -*- lexical-binding: t; -*-
;;; Re-added functions removed in https://github.com/seagle0128/doom-modeline/commit/b596440ee78b3e7d2debc3d73f4d938d968fb896 ;;; Re-added functions removed in https://github.com/seagle0128/doom-modeline/commit/b596440ee78b3e7d2debc3d73f4d938d968fb896
;;;###autoload ;;;###autoload

10
info-workarounds.el Normal file
View File

@ -0,0 +1,10 @@
;;; info-workarounds.el --- Description -*- lexical-binding: t; -*-
;;; This file allows the `info` function to find other `info` files in the system.
;;; For non-NixOS GNU/Linux
(push "/usr/share/info" Info-directory-list)
;;; For NixOS
(push "/run/current-system/sw/share/info" Info-directory-list)
(push "~/.nix-profile/share/info" Info-directory-list)