From f33a2df7b9f630547ba081cdc2b3de5e8f6e77c1 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 26 Sep 2022 16:05:48 -0700
Subject: Switch rincewind over to using Guix Home

---
 oni/home/rincewind/config.scm | 64 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 9 deletions(-)

(limited to 'oni/home/rincewind/config.scm')

diff --git a/oni/home/rincewind/config.scm b/oni/home/rincewind/config.scm
index a08caa6..710daa1 100644
--- a/oni/home/rincewind/config.scm
+++ b/oni/home/rincewind/config.scm
@@ -2,31 +2,70 @@
   #:use-module (gnu home)
   #:use-module (gnu home services)
   #:use-module (gnu home services guix)
+  #:use-module (gnu packages)
   #:use-module (gnu packages video)
   #:use-module (gnu packages music)
+  #:use-module (gnu packages emacs)
+  #:use-module (gnu packages commencement)
   #:use-module (gnu services)
   #:use-module (guix packages)
   #:use-module (guix gexp)
   #:use-module (guix store)
   #:use-module (guix derivations)
   #:use-module (guix channels)
+  #:use-module (guix transformations)
   #:use-module (oni home services environment)
-  #:use-module (oni home services rofi))
+  #:use-module (oni home services rofi)
+  #:use-module (oni home services polybar)
+  #:use-module (oni home services dunst)
+  #:use-module (oni home services zsh)
+  #:use-module (oni home services kdeconnect)
+  #:use-module (oni home services syncthing)
+  #:use-module (oni packages hlwm-run-or-raise)
+  #:use-module (oni packages pick-random-wallpaper)
+  #:use-module (oni packages notmuch-collect-tasks)
+  #:use-module (oni packages notmuch-tag-mailinglists)
+  #:use-module (oni packages inbox-size)
+  #:use-module (oni packages count-emails)
+  #:use-module (oni home common config))
+
+(define (with-master-branch package)
+  "Apply a transformation to PACKAGE so that it uses the master branch."
+  ((options->transformation
+    `((with-branch . ,(string-append (package-name package) "=master"))))
+   package))
 
 (home-environment
- (packages (list mpv mpv-mpris easytag))
+ (packages (list mpv mpv-mpris easytag emacs-next
+                 (specification->package+output "glibc-locales")
+                 (specification->package+output "font-fantasque-sans")
+                 (specification->package+output "font-comic-neue")
+                 hlwm-run-or-raise
+                 pick-random-wallpaper
+                 gcc-toolchain                  ;Needed for emacs-next?
+                 notmuch-collect-tasks
+                 notmuch-tag-mailinglists
+                 (inbox-size emacs-next)
+                 count-emails))
 
  (services
   (list
    home-environment-service
    home-rofi-default-service
+   home-dunst-default-service
+   home-redshift-service
+   home-xbindkeys-service
+   home-zsh-service
+   home-guile-service
+   home-xmodmap-service
+   home-openssh-service
+   home-kitty-service
+
+   ;; This has to be the first extension because it needs to be added to the
+   ;; configuration last.
+   (service home-zsh-syntax-highlighting-service-type)
+   (service home-zsh-autosuggestions-service-type)
 
-   ;; (simple-service 'test-config
-   ;;                 home-xdg-configuration-files-service-type
-   ;;                 #~(list `("mpv/scripts/mpv-mpris"
-   ;;                           ;; (run-with-store (open-connection) (package-file
-   ;;                           ;; mpv-mpris #:output "out"))
-   ;;                           #$(file-append mpv-mpris "/lib/mpris.so"))))
    (simple-service 'my-channel-service
                    home-channels-service-type
                    (list
@@ -45,4 +84,11 @@
                       (make-channel-introduction
                        "c23d64f1b8cc086659f8781b27ab6c7314c5cca5"
                        (openpgp-fingerprint
-                        "50F3 3E2E 5B0C 3D90 0424  ABE8 9BDC F497 A4BB CC7F")))))))))
+                        "50F3 3E2E 5B0C 3D90 0424  ABE8 9BDC F497 A4BB CC7F"))))))
+
+   (service home-polybar-service-type
+            (home-polybar-configuration
+             (bar "rincewind")))
+
+   (service home-kdeconnect-service-type)
+   (service home-syncthing-service-type))))
-- 
cgit v1.2.3-54-g00ecf