From 0a1b2f96d60c8384c523607b62a91cd93d94e28c Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <jgrunbau@sydmacx3bd.trading.imc.intra>
Date: Wed, 01 Dec 2021 06:35:40 +0000
Subject: [PATCH] Merge commit 'd2a8738'
---
init.el | 6 +++---
config.org | 11 +++++------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/config.org b/config.org
index 9fa64fa..1c1bf9c 100644
--- a/config.org
+++ b/config.org
@@ -1251,9 +1251,8 @@
** Up to date org
Pull the latest org mode from the repository, rather than the org which comes with emacs.
#+BEGIN_SRC emacs-lisp
- (use-package org
- :ensure org-plus-contrib
- :pin org)
+ (use-package org
+ :ensure org-contrib)
#+END_SRC
** Small tweaks
@@ -1283,13 +1282,13 @@
(visual-line-mode 1)))
#+END_SRC
-** org-bullets
+** Fancy org points
Use bullets of different colours and styles instead of the "\*\*\*" to denote indentation levels.
#+BEGIN_SRC emacs-lisp
- (use-package org-bullets
+ (use-package org-superstar
:ensure t
:config
- (add-hook 'org-mode-hook (lambda () (org-bullets-mode))))
+ (add-hook 'org-mode-hook (lambda () (org-superstar-mode 1))))
#+END_SRC
** Org Babel
diff --git a/init.el b/init.el
index 7c3dd14..bbe561b 100644
--- a/init.el
+++ b/init.el
@@ -4,9 +4,9 @@
;; Repos
(require 'package)
-(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/")
- ("melpa" . "https://melpa.org/packages/")
- ("org" . "https://orgmode.org/elpa/")))
+(setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
+ ("nongnu" . "https://elpa.nongnu.org/nongnu/")
+ ("melpa" . "https://melpa.org/packages/")))
(package-initialize)
;; use-package
--
Gitblit v1.9.3