From 045082d32f5bf51958e3a0381d12ac23a4730dfb Mon Sep 17 00:00:00 2001
From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Fri, 23 Dec 2022 19:39:17 +0100
Subject: [PATCH] [emacs] Install a git client.

This commit installs and configures magit, which is a git client for
emacs.
---
 conf/home/emacs.scm                 | 13 ++++++++++++-
 emacs/.config/emacs/conf/conf-vc.el | 15 +++++++++++++++
 home.scm                            |  7 +------
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 emacs/.config/emacs/conf/conf-vc.el

diff --git a/conf/home/emacs.scm b/conf/home/emacs.scm
index 0cad0c9..ab48385 100644
--- a/conf/home/emacs.scm
+++ b/conf/home/emacs.scm
@@ -19,6 +19,7 @@
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages rust-apps)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu services)
   #:use-module (guix gexp)
@@ -187,6 +188,15 @@
 		   "emacs/.config/emacs/conf/conf-web.el"
 		   "emacs/.local/bin/emacs_client")))))
 
+(define emacs-vc-service
+  (service home-program-service-type
+	   (home-program-configuration
+	    (packages
+	     (list emacs-magit git))
+	    (dotfiles
+	     (list "git/.config/git/config"
+		   "emacs/.config/emacs/conf/conf-vc.el")))))
+
 (define emacs-services
   (list emacs-batch-edit-service
         emacs-calfw-service
@@ -203,4 +213,5 @@
         emacs-package-service
         emacs-pass-service
         emacs-rss-service
-        emacs-service))
+        emacs-service
+        emacs-vc-service))
diff --git a/emacs/.config/emacs/conf/conf-vc.el b/emacs/.config/emacs/conf/conf-vc.el
new file mode 100644
index 0000000..775e5a3
--- /dev/null
+++ b/emacs/.config/emacs/conf/conf-vc.el
@@ -0,0 +1,15 @@
+;; Copyright (c) 2022 Jakub Czajka <jakub@ekhem.eu.org>
+;; License: GPL-3.0 or later.
+;;
+;; conf-vc.el - configuration of a git interface.
+
+(require 'conf-package)
+
+(use-package magit
+  :when
+  (conf:executables-p (list "git"))
+  :ensure t
+  :bind
+  ("C-c g" . magit))
+
+(provide 'conf-vc)
diff --git a/home.scm b/home.scm
index 115c808..bb5ab6d 100644
--- a/home.scm
+++ b/home.scm
@@ -5,10 +5,8 @@
 
 (use-modules (conf home bash)
 	     (conf home emacs)
-	     (conf home program)
              (gnu home services)
 	     (gnu packages base)
-	     (gnu packages version-control)
 	     (guix gexp)
 	     (guix packages))
 
@@ -16,9 +14,6 @@
  (packages (list))
  (services
   (append
-   (list (service home-program-service-type
-		  (home-program-configuration
-		   (packages (list git))
-		   (dotfiles (list "git/.config/git/config")))))
+   (list autorandr-service)
    bash-services
    emacs-services)))
-- 
2.39.5