aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorAdrian Kummerlaender2021-10-23 15:46:38 +0200
committerAdrian Kummerlaender2021-10-23 15:46:38 +0200
commitf376f85429b59e2ed1ffcc1fba911c944b196188 (patch)
treefaba2a129439db8bc11163289bbc3d109f98c848 /gui
parent3c5d1ea1587d64a64719e79173c40a7d4e2020cc (diff)
downloadnixos_home-f376f85429b59e2ed1ffcc1fba911c944b196188.tar
nixos_home-f376f85429b59e2ed1ffcc1fba911c944b196188.tar.gz
nixos_home-f376f85429b59e2ed1ffcc1fba911c944b196188.tar.bz2
nixos_home-f376f85429b59e2ed1ffcc1fba911c944b196188.tar.lz
nixos_home-f376f85429b59e2ed1ffcc1fba911c944b196188.tar.xz
nixos_home-f376f85429b59e2ed1ffcc1fba911c944b196188.tar.zst
nixos_home-f376f85429b59e2ed1ffcc1fba911c944b196188.zip
Use org 9.5 and org-contrib
I am unsure where the org-202109… org version comes from, filtering the load-path in elisp is a hacky workaround to remove it.
Diffstat (limited to 'gui')
-rw-r--r--gui/conf/init.el4
-rw-r--r--gui/emacs.nix4
2 files changed, 7 insertions, 1 deletions
diff --git a/gui/conf/init.el b/gui/conf/init.el
index 726e48e..47ab5cf 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -1,6 +1,9 @@
(setq inhibit-startup-message t)
(setq initial-scratch-message nil)
+(setq load-path (seq-filter (lambda (x) (not (string-match-p "org-202109" x)))
+ load-path))
+
(require 'package)
(package-initialize)
@@ -175,7 +178,6 @@
:ensure t)
(use-package org
- :ensure org-plus-contrib
:custom
(org-adapt-indentation nil)
(org-startup-indented t)
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 5f9a3a7..7f5b2ff 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -49,12 +49,16 @@
package = pkgs-unstable.emacsWithPackagesFromUsePackage {
config = ./conf/init.el;
alwaysEnsure = false;
+
package = pkgs-unstable.emacsGit.override { nativeComp = true; };
+
extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
pdf-tools
mu4e-alert
]) ++ (with epkgs.elpaPackages; [
auctex
+ ]) ++ (with epkgs.nongnuPackages; [
+ org-contrib
])++ [
akr-color-theme
custom-runtime-env