From 36dbf696e73bb31132022cce6e8ff19b511fe3fe Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 8 Jul 2023 02:22:43 +0000
Subject: [PATCH] fontconfig: only enable for system, not user

---
 hosts/common/programs/zsh/default.nix | 4 +++-
 hosts/modules/gui/sway/default.nix    | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hosts/common/programs/zsh/default.nix b/hosts/common/programs/zsh/default.nix
index 7def5bcd..924e4777 100644
--- a/hosts/common/programs/zsh/default.nix
+++ b/hosts/common/programs/zsh/default.nix
@@ -74,6 +74,9 @@ in
         '' + lib.optionalString cfg.showDeadlines ''
           ${pkgs.sane-scripts.deadlines}/bin/sane-deadlines
         '' + ''
+
+          HISTFILE="$HOME/.local/share/zsh/history"
+
           # auto-cd into any of these dirs by typing them and pressing 'enter':
           hash -d 3rd="/home/colin/dev/3rd"
           hash -d dev="/home/colin/dev"
@@ -133,7 +136,6 @@ in
 
       programs.zsh = {
         enable = true;
-        histFile = "$HOME/.local/share/zsh/history";
         shellAliases = {
           ":q" = "exit";
           # common typos
diff --git a/hosts/modules/gui/sway/default.nix b/hosts/modules/gui/sway/default.nix
index 90806b50..bc178862 100644
--- a/hosts/modules/gui/sway/default.nix
+++ b/hosts/modules/gui/sway/default.nix
@@ -74,7 +74,11 @@ in
     }
 
     (mkIf cfg.enable {
+      sane.programs.fontconfig.enableFor.system = true;
       sane.programs.swayApps.enableFor.user.colin = true;
+      # we need the greeter's command to be on our PATH
+      users.users.colin.packages = [ sway-launcher ];
+
       sane.gui.gtk.enable = lib.mkDefault true;
       # sane.gui.gtk.gtk-theme = lib.mkDefault "Fluent-Light-compact";
       sane.gui.gtk.gtk-theme = lib.mkDefault "Tokyonight-Light-B";
@@ -90,8 +94,6 @@ in
           default_session = if cfg.useGreeter then greeter-session else greeterless-session;
         };
       };
-      # we need the greeter's command to be on our PATH
-      users.users.colin.packages = [ sway-launcher ];
 
       # some programs (e.g. fractal) **require** a "Secret Service Provider"
       services.gnome.gnome-keyring.enable = true;