From c5261caa21b1f265c669992da2b1f1a72a21860d Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Wed, 11 Sep 2024 15:06:41 +0100
Subject: [PATCH] base-graphical: include settings for fonts, libinput,
 printing

---
 common/base-graphical/default.nix |  6 ++++++
 hosts/kilgharrah/default.nix      |  2 --
 hosts/tohru/default.nix           |  3 ---
 services/default.nix              |  1 -
 services/fonts.nix                | 17 -----------------
 5 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 services/fonts.nix

diff --git a/common/base-graphical/default.nix b/common/base-graphical/default.nix
index 40542ce..f651ce0 100644
--- a/common/base-graphical/default.nix
+++ b/common/base-graphical/default.nix
@@ -14,5 +14,11 @@ in
 
   config = mkIf cfg.enable {
     services.xserver.enable = true;
+    services.libinput.enable = true;
+    services.printing.enable = true;
+
+    fonts.packages = with pkgs; [
+      corefonts
+    ];
   };
 }
diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index b4e969f..6372b16 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -24,8 +24,6 @@
   console.keyMap = "uk";
   services.xserver.xkb.layout = "gb";
 
-  services.printing.enable = true;
-
   age.secrets.user-password-kilgharrah-qenya.file = ../../secrets/user-password-kilgharrah-qenya.age;
   users.users.qenya.hashedPasswordFile = config.age.secrets.user-password-kilgharrah-qenya.path;
   users.users.qenya.extraGroups = [ "wheel" ];
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index eab9a11..53fb544 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -25,8 +25,6 @@
   console.keyMap = "uk";
   services.xserver.xkb.layout = "gb";
 
-  services.printing.enable = true;
-
   age.secrets.user-password-tohru-qenya.file = ../../secrets/user-password-tohru-qenya.age;
   users.users.qenya.hashedPasswordFile = config.age.secrets.user-password-tohru-qenya.path;
   users.users.qenya.extraGroups = [
@@ -38,7 +36,6 @@
 
   programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
   programs.steam.enable = true;
-  qenya.services.fonts.enable = true;
 
   system.stateVersion = "23.11";
 }
diff --git a/services/default.nix b/services/default.nix
index d9c3ff2..beecd73 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./fonts.nix
     ./forgejo.nix
   ];
 }
\ No newline at end of file
diff --git a/services/fonts.nix b/services/fonts.nix
deleted file mode 100644
index dcd9d1b..0000000
--- a/services/fonts.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.qenya.services.fonts;
-in
-{
-  options.qenya.services.fonts = {
-    enable = mkEnableOption "Fonts";
-  };
-
-  config = mkIf cfg.enable {
-    fonts.packages = with pkgs; [
-      corefonts
-    ];
-  };
-}