From 62b8eb28bfc95b3e37c865a2ea8c5ae3a0d2699f Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 6 Mar 2023 22:12:25 -0800
Subject: [PATCH] Clean up rincewind config imports

---
 oni/home/config/rincewind.scm | 127 +++++++++++++++++++++++-----------
 1 file changed, 86 insertions(+), 41 deletions(-)

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index cd7adc8..8649208 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -1,45 +1,90 @@
 (define-module (oni home config rincewind)
-  #:use-module (gnu home services guix)
-  #:use-module (gnu home services)
-  #:use-module (gnu home)
-  #:use-module (gnu packages commencement)
-  #:use-module (gnu packages emacs)
-  #:use-module (gnu packages emacs-xyz)
-  #:use-module (gnu packages file-systems)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages music)
-  #:use-module (gnu packages video)
-  #:use-module (gnu packages wm)
-  #:use-module (gnu packages)
-  #:use-module (gnu services)
-  #:use-module (guix channels)
-  #:use-module (guix derivations)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix store)
-  #:use-module (guix transformations)
-  #:use-module (oni home config common)
-  #:use-module (oni home services dunst)
-  #:use-module (oni home services emacs)
-  #:use-module (oni home services environment)
-  #:use-module (oni home services flameshot)
-  #:use-module (oni home services kdeconnect)
-  #:use-module (oni home services mpd)
-  #:use-module (oni home services polybar)
-  #:use-module (oni home services rofi)
-  #:use-module (oni home services syncthing)
-  #:use-module (oni home services zsh)
-  #:use-module (oni packages count-emails)
-  #:use-module (oni packages emacs)
-  #:use-module (oni packages hlwm-run-or-raise)
-  #:use-module (oni packages inbox-size)
-  #:use-module (oni packages mpd-random-albums)
-  #:use-module (oni packages notmuch-collect-tasks)
-  #:use-module (oni packages notmuch-tag-mailinglists)
-  #:use-module (oni packages pick-random-wallpaper)
-  #:use-module (oni packages shutdown-rofi)
-  #:use-module (oni packages emacs-outli)
-  #:use-module (oop goops))
+  #:use-module ((gnu home services guix)
+                #:select (home-channels-service-type))
+  #:use-module ((gnu home)
+                #:select (home-environment))
+  #:use-module ((gnu packages emacs)
+                #:select (emacs-next))
+  #:use-module ((gnu packages emacs-xyz)
+                #:select (emacs-litable
+                          emacs-org-roam
+                          emacs-vterm))
+  #:use-module ((gnu packages file-systems)
+                #:select (tmsu))
+  #:use-module ((gnu packages linux)
+                #:select (fakeroot))
+  #:use-module ((gnu packages music)
+                #:select (easytag))
+  #:use-module ((gnu packages video)
+                #:select (mpv
+                          mpv-mpris))
+  #:use-module ((gnu packages wm)
+                #:select (stumpwm))
+  #:use-module ((gnu packages)
+                #:select (specification->package+output))
+  #:use-module ((gnu services)
+                #:select (service
+                          simple-service))
+  #:use-module ((guix channels)
+                #:select (channel
+                          make-channel-introduction
+                          openpgp-fingerprint))
+  #:use-module ((oni home config common)
+                #:select (home-redshift-service
+                          home-xbindkeys-service
+                          home-zsh-service
+                          home-guile-service
+                          home-xmodmap-service
+                          home-openssh-service
+                          home-kitty-service))
+  #:use-module ((oni home services dunst)
+                #:select (home-dunst-default-service))
+  #:use-module ((oni home services emacs)
+                #:select (home-emacs-service-type
+                          home-emacs-configuration))
+  #:use-module ((oni home services environment)
+                #:select (home-environment-service))
+  #:use-module ((oni home services flameshot)
+                #:select (home-flameshot-service-type))
+  #:use-module ((oni home services kdeconnect)
+                #:select (home-kdeconnect-service-type))
+  #:use-module ((oni home services mpd)
+                #:select (home-mpd-service-type
+                          home-mpd-configuration
+                          <home-mpd-audio-output>
+                          home-mpc-update-service-type))
+  #:use-module ((oni home services polybar)
+                #:select (home-polybar-service-type
+                          home-polybar-configuration))
+  #:use-module ((oni home services rofi)
+                #:select (home-rofi-default-service))
+  #:use-module ((oni home services syncthing)
+                #:select (home-syncthing-service-type))
+  #:use-module ((oni home services zsh)
+                #:select (home-zsh-syntax-highlighting-service-type
+                          home-zsh-autosuggestions-service-type))
+  #:use-module ((oni packages count-emails)
+                #:select (count-emails))
+  #:use-module ((oni packages emacs)
+                #:select (emacs-inkplate))
+  #:use-module ((oni packages hlwm-run-or-raise)
+                #:select (hlwm-run-or-raise))
+  #:use-module ((oni packages inbox-size)
+                #:select (inbox-size))
+  #:use-module ((oni packages mpd-random-albums)
+                #:select (mpd-random-albums))
+  #:use-module ((oni packages notmuch-collect-tasks)
+                #:select (notmuch-collect-tasks))
+  #:use-module ((oni packages notmuch-tag-mailinglists)
+                #:select (notmuch-tag-mailinglists))
+  #:use-module ((oni packages pick-random-wallpaper)
+                #:select (pick-random-wallpaper))
+  #:use-module ((oni packages shutdown-rofi)
+                #:select (shutdown-rofi))
+  #:use-module ((oni packages emacs-outli)
+                #:select (emacs-outli))
+  #:use-module ((oop goops)
+                #:select (make)))
 
 (define (with-master-branch package)
   "Apply a transformation to PACKAGE so that it uses the master branch."