site: update

4 files changed, 32 insertions, 16 deletions

diff --git a/news/20210228.org b/news/20210228.org
index 055ab28..3cd89ec 100644
--- a/news/20210228.org
+++ b/news/20210228.org
@@ -1,5 +1,5 @@
 #+TITLE: {{{date(%b %d\, %Y)}}}
 #+DATE: <2021-02-28 Sun>
 
-Mailing lists for Carbs Linux has changed, see [[file:mailing-lists.html][the mailing lists section]] for
+Mailing lists for Carbs Linux has changed, see [[file:../mailing-lists.html][the mailing lists section]] for
 more information on subscribing and list information.
diff --git a/org-publish.el b/org-publish.el
index a33713e..11d05d2 100755
--- a/org-publish.el
+++ b/org-publish.el
@@ -20,12 +20,26 @@
   (unless (package-installed-p pkg)
     (package-install pkg)))
 
+;; Taken from doom-emacs
+(defmacro c/pushnew! (place &rest values)
+  "Push VALUES sequentially into PLACE, if they aren't already present.
+This is a variadic `cl-pushnew'."
+  (let ((var (make-symbol "result")))
+    `(dolist (,var (list ,@values) (with-no-warnings ,place))
+       (cl-pushnew ,var ,place :test #'equal))))
+
 (require 'cl-lib)
 (require 'sh-script)
 (require 'ox)
 (require 'ox-publish)
 (require 'ox-rss)
 
+;; Some Quality of Life link abbrevations.
+(c/pushnew! org-link-abbrev-alist
+            '("carbs-pkg" . "https://git.sr.ht/~carbslinux/repository/tree/master/item/%s")
+            '("srht"      . "https://git.sr.ht/%s")
+            '("github"    . "https://github.com/%s"))
+
 (defvar carbs--src-directory (expand-file-name "src/" default-directory)
   "Directory for most of the static webpage content")
 
diff --git a/src/index.org b/src/index.org
index df5a98f..4933529 100644
--- a/src/index.org
+++ b/src/index.org
@@ -8,8 +8,10 @@ The system can consist of as much or as little as its user can intend to.
 
 * Package Manager
 
-Carbs Linux uses its own package manager [[https://github.com/CarbsLinux/cpt][Carbs Packaging Tools]], a POSIX shell
-package manager forked from KISS with the tool-based approach of xbps.
+Carbs Linux uses its own package manager [[https://git.sr.ht/~carbslinux/cpt][Carbs Packaging Tools]], a POSIX shell
+package manager forked from [[https://github.com/kisslinux/kiss][KISS]] with the tool-based approach of [[https://github.com/void-linux/xbps][xbps]]. Its aim
+is to deliver easy-to-use tools while also providing a powerful POSIX shell
+library that can be used to further extend and script the packaging system.
 
 
 * Small base
@@ -24,17 +26,17 @@ building new software. The majority of the base packages are statically linked.
 Carbs Linux has support for multiple init systems and service supervisors. In
 the main repository are
 
-- =sinit=
-- =busybox-init= (SysVinit clone)
-- =runit-init=
+- [[carbs-pkg:core/sinit][sinit]] / [[carbs-pkg:extra/shinit][shinit]]
+- [[carbs-pkg:core/busybox][busybox-init]] (SysVinit clone)
+- [[carbs-pkg:core/runit][runit-init]]
 
 for init systems, and
 
-- =sysmgr=
-- =busybox-runit=
-- =runit=
+- [[carbs-pkg:core/sysmgr][sysmgr]]
+- [[carbs-pkg:core/busybox][busybox-runit]]
+- [[carbs-pkg:core/runit][runit]]
 
-for service supervisors. The [[https://github.com/CarbsLinux/repository/tree/master/core/carbs-init][carbs-init]] package is the collection of init
+for service supervisors. The [[carbs-pkg:core/carbs-init][carbs-init]] package is the collection of init
 scripts that ensure the interoperability of these init and service systems, and
 make it easier for the user to switch to their preferred combinations of system
 supervision.
diff --git a/src/mailing-lists.org b/src/mailing-lists.org
index fa3698e..c33848e 100644
--- a/src/mailing-lists.org
+++ b/src/mailing-lists.org
@@ -4,12 +4,12 @@ Carbs Linux aims to move the development and discussion to mailing lists as much
 as possible, using the mailing lists hosted at [[https://lists.sr.ht/~carbslinux][Sourcehut]]. The following mailing
 lists are available for subscription:
 
-- ~carbslinux/carbslinux-devel
-- ~carbslinux/carbslinux-discuss
-- ~carbslinux/carbslinux-announce
-- ~carbslinux/cpt-devel
-- ~carbslinux/cpt-discuss
-- ~carbslinux/cpt-announce
+- [[https://lists.sr.ht/~carbslinux/carbslinux-devel][~carbslinux/carbslinux-devel]]
+- [[https://lists.sr.ht/~carbslinux/carbslinux-discuss][~carbslinux/carbslinux-discuss]]
+- [[https://lists.sr.ht/~carbslinux/carbslinux-announce][~carbslinux/carbslinux-announce]]
+- [[https://lists.sr.ht/~carbslinux/cpt-devel][~carbslinux/cpt-devel]]
+- [[https://lists.sr.ht/~carbslinux/cpt-discuss][~carbslinux/cpt-discuss]]
+- [[https://lists.sr.ht/~carbslinux/cpt-announce][~carbslinux/cpt-announce]]
 
 If you want to subscribe to any of these mailing lists, send an empty mail to
 one of these mailing lists in the following format: