From f376f85429b59e2ed1ffcc1fba911c944b196188 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 23 Oct 2021 15:46:38 +0200
Subject: 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.
---
 gui/conf/init.el | 4 +++-
 gui/emacs.nix    | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3