From 90a632afb130605dc1a958543a8a5ac0d879e2f9 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 15 Oct 2023 16:47:26 -0400
Subject: [PATCH] refactor: move fonts to common

---
 common/default.nix         |  9 +++------
 common/modules/locale.nix  | 38 ++++++++++++++++++++++++++++++++++++++
 hosts/wim/cfg/packages.nix | 38 --------------------------------------
 3 files changed, 41 insertions(+), 44 deletions(-)
 create mode 100644 common/modules/locale.nix

diff --git a/common/default.nix b/common/default.nix
index 9667d0d5..52e55366 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,16 +1,12 @@
 { config, home-manager, lib, nixpkgs, nur, nix-melt, nurl, pkgs, ... }: {
+
   imports = [
     home-manager.nixosModules.default
     ./modules/programs.nix
+    ./modules/locale.nix
     ./overlays/list.nix
   ];
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_CA.UTF-8";
-  console = {
-    keyMap = "ca";
-  };
-
   nixpkgs.config.allowUnfree = true;
 
   nix = {
@@ -53,6 +49,7 @@
       ]) ++
 
       (with pkgs; [
+        dracula-theme
         neofetch
         progress
         wget
diff --git a/common/modules/locale.nix b/common/modules/locale.nix
new file mode 100644
index 00000000..b37e1b61
--- /dev/null
+++ b/common/modules/locale.nix
@@ -0,0 +1,38 @@
+{ pkgs, ... }: {
+  fonts = {
+    fontconfig = {
+      enable = true;
+      defaultFonts = {
+        emoji = [ "Noto Color Emoji" ];
+        monospace = [ "JetBrainsMono Nerd Font" ];
+        sansSerif = [ "JetBrainsMono Nerd Font" ];
+        serif = [ "JetBrainsMono Nerd Font" ];
+      };
+    };
+
+    packages = with pkgs; [
+      (nerdfonts.override { fonts = [
+        "JetBrainsMono"
+        "Go-Mono"
+        "Iosevka"
+        "NerdFontsSymbolsOnly"
+        "SpaceMono"
+        "Ubuntu"
+      ]; })
+      noto-fonts
+      noto-fonts-cjk
+      noto-fonts-emoji
+      liberation_ttf
+      font-awesome
+      meslo-lgs-nf
+      jetbrains-mono
+      ubuntu_font_family
+    ];
+  };
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_CA.UTF-8";
+  console = {
+    keyMap = "ca";
+  };
+}
diff --git a/hosts/wim/cfg/packages.nix b/hosts/wim/cfg/packages.nix
index 9c721dfa..1c3cd83c 100644
--- a/hosts/wim/cfg/packages.nix
+++ b/hosts/wim/cfg/packages.nix
@@ -83,52 +83,14 @@
   # List packages in root user PATH
   environment.systemPackages = with pkgs; [
     # for sddm
-    dracula-theme
     plasma5Packages.plasma-framework
     plasma5Packages.plasma-workspace
 
     qemu
     wl-clipboard
     alsa-utils
-    wget
-    tree
-    rsync
-    killall
-    imagemagick
-    usbutils
     evtest
     plasma5Packages.kio-admin
     plasma5Packages.ksshaskpass
   ];
-
-  fonts = {
-    fontconfig = {
-      enable = true;
-      /*defaultFonts = {
-        emoji = [ "Noto Color Emoji" ];
-        monospace = [ "MesloLGS Nerd Font" ];
-        sansSerif = [ "MesloLGS Nerd Font" ];
-        serif = [ "MesloLGS Nerd Font" ];
-      };*/
-    };
-
-    packages = with pkgs; [
-      (nerdfonts.override { fonts = [
-        "JetBrainsMono"
-        "Go-Mono"
-        "Iosevka"
-        "NerdFontsSymbolsOnly"
-        "SpaceMono"
-        "Ubuntu"
-      ]; })
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      liberation_ttf
-      font-awesome
-      meslo-lgs-nf
-      jetbrains-mono
-      ubuntu_font_family
-    ];
-  };
 }