rincewind: Simplify imports

1 files changed, 47 insertions, 184 deletions

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 9db1a49..42828f8 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -1,199 +1,62 @@
 (define-module (oni home config rincewind)
-  #:use-module ((gnu home)
-                #:select (home-environment))
+  #:use-module (gnu home)
   #:use-module (gnu home services)
-  #:use-module ((gnu home services mail)
-                #:select (home-msmtp-service-type
-                          home-msmtp-configuration
-                          msmtp-configuration
-                          msmtp-account))
-  #:use-module ((gnu home services gnupg)
-                #:select (home-gpg-agent-service-type
-                          home-gpg-agent-configuration))
+  #:use-module (gnu home services mail)
+  #:use-module (gnu home services gnupg)
   #:use-module (gnu home services shells)
-  #:use-module ((gnu home services ssh)
-                #:select (home-ssh-agent-service-type))
-  #:use-module ((gnu packages cdrom)
-                #:select (abcde))
-  #:use-module ((gnu packages databases)
-                #:select (recutils
-                          emacs-rec-mode))
-  #:use-module ((gnu packages emacs)
-                #:select (emacs-next))
-  #:use-module ((gnu packages emacs-xyz)
-                #:select (emacs-guix
-                          emacs-org-contacts
-                          emacs-fennel-mode
-                          emacs-gnuplot))
-  #:use-module ((gnu packages file-systems)
-                #:select (tmsu))
-  #:use-module ((gnu packages forth)
-                #:select (gforth))
-  #:use-module ((gnu packages librewolf)
-                #:select (librewolf))
-  #:use-module ((gnu packages mail)
-                #:select (notmuch
-                          emacs-notmuch))
+  #:use-module (gnu home services ssh)
+  #:use-module (gnu packages cdrom)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages emacs)
+  #:use-module (gnu packages emacs-xyz)
+  #:use-module (gnu packages file-systems)
+  #:use-module (gnu packages forth)
+  #:use-module (gnu packages librewolf)
+  #:use-module (gnu packages mail)
   #:use-module (gnu packages music)
   #:use-module (gnu packages perl-web)
-  #:use-module ((gnu packages tree-sitter)
-                #:select (tree-sitter-bash
-                          tree-sitter-scheme
-                          tree-sitter-python
-                          tree-sitter-org
-                          tree-sitter-json
-                          tree-sitter-css))
+  #:use-module (gnu packages tree-sitter)
   #:use-module (gnu packages web)
-  #:use-module ((gnu packages)
-                #:select (specification->package+output
-                          specification->package))
-  #:use-module ((gnu services)
-                #:select (service
-                          simple-service))
-  #:use-module ((guix channels)
-                #:select (channel
-                          make-channel-introduction
-                          openpgp-fingerprint))
-  #:use-module ((guix gexp)
-                #:select (local-file
-                          mixed-text-file))
+  #:use-module (gnu packages)
+  #:use-module (gnu services)
+  #:use-module (guix channels)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:use-module ((guix transformations)
-                #:select (options->transformation))
-  #:use-module ((nongnu packages emacs)
-                #:select (emacs-org-roam-ui))
+  #:use-module (guix transformations)
+  #:use-module (nongnu packages emacs)
   #:use-module (oni home config common)
-  #:use-module ((oni home services copyq)
-                #:select (home-copyq-service-type))
-  #:use-module ((oni home services dunst)
-                #:select (home-dunst-default-service))
+  #:use-module (oni home services copyq)
+  #:use-module (oni home services dunst)
   #:use-module (oni home services emacs)
-  #: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 environment)
+  #:use-module (oni home services flameshot)
   #:use-module (oni home services freedesktop)
-  #:use-module ((oni home services git)
-                #:select (home-git-service-type
-                          home-git-configuration))
-  #:use-module ((oni home services gnuzilla)
-                #:select (home-icecat-service-type
-                          home-icecat-configuration))
-  #: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
-                          home-mpd-notify-service-type
-                          home-mpdscrobble-service-type))
-  #:use-module ((oni home services mpv)
-                #:select (home-mpv-service-type
-                          home-mpv-mpris-service-type))
-  #:use-module ((oni home services notmuch)
-                #:select (home-notmuch-service-type
-                          home-notmuch-configuration))
-  #:use-module ((oni home services picom)
-                #:select (home-picom-service-type
-                          home-picom-configuration))
-  #: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 stumpwm)
-                #:select (home-stumpwm-service-type
-                          home-stumpwm-configuration
-                          home-stumpwm-gaps-service-type
-                          home-stumpwm-gaps-configuration
-                          home-stumpwm-stumptray-service-type
-                          home-stumpwm-stumptray-configuration))
-  #:use-module ((oni home services syncthing)
-                #:select (home-syncthing-service-type))
+  #:use-module (oni home services git)
+  #:use-module (oni home services gnuzilla)
+  #:use-module (oni home services kdeconnect)
+  #:use-module (oni home services mpd)
+  #:use-module (oni home services mpv)
+  #:use-module (oni home services notmuch)
+  #:use-module (oni home services picom)
+  #:use-module (oni home services polybar)
+  #:use-module (oni home services rofi)
+  #:use-module (oni home services stumpwm)
+  #:use-module (oni home services syncthing)
   #:use-module (oni home services terminals)
-  #:use-module ((oni home services utilities)
-                #:select (home-inkplate-display-service-type))
-  #:use-module ((oni home services zsh)
-                #:select (home-zsh-syntax-highlighting-service-type
-                          home-zsh-autosuggestions-service-type
-                          home-zsh-autopair-service-type
-                          home-zsh-atuin-service-type
-                          home-zsh-atuin-configuration))
-  #:use-module ((oni packages count-emails)
-                #:select (count-emails))
+  #:use-module (oni home services utilities)
+  #:use-module (oni home services zsh)
+  #:use-module (oni packages count-emails)
   #:use-module (oni packages emacs)
-  #:use-module ((oni packages emacs-config)
-                #:select (emacs-oni-org-roam
-                          emacs-oni-elfeed
-                          emacs-oni-elisp
-                          emacs-oni-eshell
-                          emacs-oni-core
-                          emacs-oni-compilation
-                          emacs-oni-common-lisp
-                          emacs-oni-gui
-                          emacs-oni-magit
-                          emacs-oni-notmuch
-                          emacs-oni-hy
-                          emacs-oni-project
-                          emacs-oni-bookmark
-                          emacs-oni-dired
-                          emacs-oni-browse-url
-                          emacs-oni-c
-                          emacs-oni-circe
-                          emacs-oni-clojure
-                          emacs-oni-cmake
-                          emacs-oni-conf
-                          emacs-oni-cpp
-                          emacs-oni-csharp
-                          emacs-oni-css
-                          emacs-oni-diff-hl
-                          emacs-oni-ediff
-                          emacs-oni-elm
-                          emacs-oni-emms
-                          emacs-oni-epub
-                          emacs-oni-eww
-                          emacs-oni-grep
-                          emacs-oni-haskell
-                          emacs-oni-highlight-indent-guides
-                          emacs-oni-html
-                          emacs-oni-java
-                          emacs-oni-json
-                          emacs-oni-log-edit
-                          emacs-oni-lua
-                          emacs-oni-makefile
-                          emacs-oni-nxml
-                          emacs-oni-package
-                          emacs-oni-projectile
-                          emacs-oni-scheme
-                          emacs-oni-sh
-                          emacs-oni-shr
-                          emacs-oni-tramp
-                          emacs-oni-embrace
-                          emacs-oni-yaml
-                          emacs-oni-python
-                          emacs-oni-git-commit
-                          emacs-oni-php
-                          emacs-oni-web-mode
-                          emacs-oni-js))
-  #:use-module ((oni packages inbox-size)
-                #:select (inbox-size))
-  #:use-module ((oni packages mpd)
-                #: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 stumpwm)
-                #:select (stumpwm+swank))
-  #:use-module ((oni packages terminals)
-                #:select (tym))
-  #:use-module ((oop goops)
-                #:select (make)))
+  #:use-module (oni packages emacs-config)
+  #:use-module (oni packages inbox-size)
+  #:use-module (oni packages mpd)
+  #: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 stumpwm)
+  #:use-module (oni packages terminals)
+  #:use-module (oop goops))
 
 (define (with-master-branch package)
   "Apply a transformation to PACKAGE so that it uses the master branch."