From 13b77284955595bf174c022dff5f20f005e672f9 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 9 Dec 2024 10:00:02 -0800
Subject: [PATCH] Fix basic Emacs setup, add magit

---
 oni/home/config/pop-os.scm | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index 595f248..bc54819 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -12,13 +12,41 @@
 		#:select (home-channels-service))
   #:use-module ((oni home services emacs)
 		#:select (home-emacs-service-type
-			  home-emacs-configuration))
+			      home-emacs-configuration))
   #:use-module ((oni home services environment)
-		#:select (home-environment-service)))
+		#:select (home-environment-service))
+  #:use-module ((oni packages emacs-config)
+		#:select (emacs-oni-browse-url
+                  emacs-oni-common-lisp
+                  emacs-oni-compilation
+                  emacs-oni-core
+                  emacs-oni-diff-hl
+                  emacs-oni-dired
+                  emacs-oni-elisp
+                  emacs-oni-git-commit
+                  emacs-oni-gui
+                  emacs-oni-log-edit
+                  emacs-oni-magit
+                  emacs-oni-package
+                  emacs-oni-project)))
 
 (home-environment
  (packages (list (specification->package+output "glibc-locales")
-		 (specification->package+output "font-fantasque-sans")))
+		         (specification->package+output "font-fantasque-sans")
+                 (specification->package+output "font-comic-neue")
+		         emacs-oni-core
+                 emacs-oni-compilation
+                 emacs-oni-common-lisp
+                 emacs-oni-browse-url
+                 emacs-oni-package
+                 emacs-oni-elisp
+                 emacs-oni-gui
+                 emacs-oni-magit
+                 emacs-oni-diff-hl
+                 emacs-oni-project
+                 emacs-oni-dired
+                 emacs-oni-log-edit
+                 emacs-oni-git-commit))
  (services (list home-channels-service
 		 home-environment-service
 		 (service home-emacs-service-type
@@ -29,8 +57,8 @@
 			     (mixed-text-file
 			      "init.el"
 			      "(with-eval-after-load 'project (require 'oni-project))\n"
-			      "(projectile-mode)\n"
+                  "(require 'oni-gui)\n"
 			      "(setq custom-file \"~/.config/emacs/custom.el\")\n"
-			      "(load custom-file)\n"
+			      "(load custom-file :noerror)\n"
 			      "(provide 'init)\n"
 			      ";;; init.el ends here\n"))))))))