wttr popup fix, firefox on nix, fontconfig fixes

1 files changed, 22 insertions, 2 deletions

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index b9e95d0..683f6aa 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -15,6 +15,7 @@
              (gnu home services shells)
              (gnu home services desktop)
              (gnu home services gnupg)
+             (gnu home services fontutils)
              (gnu home services)
              (ryan-services pipewire)
              (ryan-services spotify)
@@ -134,7 +135,7 @@
                                                     "signal-desktop"
                                                     "sc-im"
                                                     "git-lfs"))
-                    (list my-neovim wl-mirror firefox-wrapped calcurse-fixed )))
+                    (list my-neovim wl-mirror calcurse-fixed )))
 
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
@@ -169,12 +170,31 @@
                     (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
                     ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
                     ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
-                    (".fonts" ,(local-file "fonts" #:recursive? #t))
+                    (".local/share/fonts" ,(local-file "fonts" #:recursive? #t))
                     (".gitconfig" ,(local-file "gitconfig"))
                     (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
                     (".nix-channels" ,(local-file "nix-channels"))))
          (service home-pipewire-service-type)
          (service home-spotifyd-service-type)
+         ; font things for nix to play nice
+         (simple-service 'additional-fonts-service
+                         home-fontconfig-service-type
+                         (list "~/.nix-profile/share/fonts"
+                               '(match (@ (target "pattern"))
+                                       (edit (@ (name "family") (mode "prepend"))
+                                             (string "DejaVu Sans")))
+                               '(alias
+                                  (family "serif")
+                                  (prefer
+                                    (family "DejaVu Serif")))
+                               '(alias
+                                  (family "sans")
+                                  (prefer
+                                    (family "DejaVu Sans")))
+                               '(alias
+                                  (family "monospace")
+                                  (prefer
+                                    (family "DejaVu Sans Mono")))))
          (service home-dbus-service-type)
                            ;;; trying some changes
          ;(template-files "."