aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2024-12-09 10:00:02 -0800
committerGravatar Tom Willemse2024-12-09 10:15:58 -0800
commit13b77284955595bf174c022dff5f20f005e672f9 (patch)
tree0e4acef64582a48877bcdb5af7bef9161531488d
parent68f39457891db10969e43f030f687414385af649 (diff)
downloadnew-dotfiles-13b77284955595bf174c022dff5f20f005e672f9.tar.gz
new-dotfiles-13b77284955595bf174c022dff5f20f005e672f9.zip
Fix basic Emacs setup, add magit
-rw-r--r--oni/home/config/pop-os.scm38
1 files 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"))))))))