From d4a65ca9197db98306df37c1e17b85a1e6a0d67d Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Wed, 5 Feb 2025 16:14:42 -0800
Subject: migration: split system config and move fonts to system

---
 snowfall/modules/nixos/fonts/default.nix           | 38 ----------------------
 snowfall/modules/nixos/suites/desktop/default.nix  |  2 +-
 snowfall/modules/nixos/system/default.nix          | 20 ------------
 snowfall/modules/nixos/system/fonts/default.nix    | 38 ++++++++++++++++++++++
 .../modules/nixos/system/impermanence/default.nix  | 27 +++++++++++++++
 snowfall/systems/x86_64-linux/c-pc/default.nix     | 11 ++++---
 6 files changed, 72 insertions(+), 64 deletions(-)
 delete mode 100644 snowfall/modules/nixos/fonts/default.nix
 create mode 100644 snowfall/modules/nixos/system/fonts/default.nix
 create mode 100644 snowfall/modules/nixos/system/impermanence/default.nix

diff --git a/snowfall/modules/nixos/fonts/default.nix b/snowfall/modules/nixos/fonts/default.nix
deleted file mode 100644
index 8055925..0000000
--- a/snowfall/modules/nixos/fonts/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ options, config, lib, pkgs, namespace, ... }:
-
-with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.fonts;
-in {
-  options.${namespace}.fonts = with types; {
-    enable = mkEnableOption "fonts";
-    nerdfonts = mkEnableOption "nerdfonts";
-    extra = mkOption {
-      type = listOf package;
-      default = [];
-      description = ''
-        additional fonts to install
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    fonts = {
-      packages = with pkgs; [
-        noto-fonts
-        noto-fonts-cjk-sans
-        noto-fonts-cjk-serif
-        noto-fonts-emoji
-      ] ++ (
-        optionals cfg.nerdfonts (
-          cfg.nerdfonts builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
-        )
-      ) ++ cfg.extra;
-
-      fontconfig.defaultFonts = {
-        monospace = [ "CaskaydiaMono Nerd Font" ];
-        sansSerif = [ "DejaVu Sans" "Noto Sans CJK JP" "Noto Sans" ];
-        serif = [ "DejaVu Serif" "Noto Serif CJK JP" "Noto Serif" ];
-      };
-    };
-  };
-}
diff --git a/snowfall/modules/nixos/suites/desktop/default.nix b/snowfall/modules/nixos/suites/desktop/default.nix
index 09dd4e3..90b60cc 100644
--- a/snowfall/modules/nixos/suites/desktop/default.nix
+++ b/snowfall/modules/nixos/suites/desktop/default.nix
@@ -19,7 +19,7 @@ in {
         playerctl.enable = true;
       };
 
-      fonts.enable = true;
+      system.fonts.enable = true;
     };
   };
 }
diff --git a/snowfall/modules/nixos/system/default.nix b/snowfall/modules/nixos/system/default.nix
index 7d23117..83263ba 100644
--- a/snowfall/modules/nixos/system/default.nix
+++ b/snowfall/modules/nixos/system/default.nix
@@ -12,8 +12,6 @@ in {
       default = null;
       type = nullOr str;
     };
-
-    impermanent = mkEnableOption "root impermanence";
   };
 
   config = {
@@ -21,23 +19,5 @@ in {
   
     networking.hostName = cfg.hostname;
     networking.hostId = cfg.id;
-
-    environment = mkIf cfg.impermanent {
-      persistence."/persist/system" = {
-        hideMounts = true;
-
-        directories = [
-          "/etc/nixos"
-          "/var/log"
-          "/var/lib/nixos"
-          "/var/lib/systemd/coredump"
-          # "/var/lib/bluetooth"
-        ];
-        
-        files = [
-          "/etc/machine-id"
-        ];
-      };
-    };
   };
 }
diff --git a/snowfall/modules/nixos/system/fonts/default.nix b/snowfall/modules/nixos/system/fonts/default.nix
new file mode 100644
index 0000000..f4317c3
--- /dev/null
+++ b/snowfall/modules/nixos/system/fonts/default.nix
@@ -0,0 +1,38 @@
+{ options, config, lib, pkgs, namespace, ... }:
+
+with lib; with lib.${namespace}; let
+  cfg = config.${namespace}.system.fonts;
+in {
+  options.${namespace}.system.fonts = with types; {
+    enable = mkEnableOption "fonts";
+    nerdfonts = mkEnableOption "nerdfonts";
+    extra = mkOption {
+      type = listOf package;
+      default = [];
+      description = ''
+        additional fonts to install
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    fonts = {
+      packages = with pkgs; [
+        noto-fonts
+        noto-fonts-cjk-sans
+        noto-fonts-cjk-serif
+        noto-fonts-emoji
+      ] ++ (
+        optionals cfg.nerdfonts (
+          cfg.nerdfonts builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
+        )
+      ) ++ cfg.extra;
+
+      fontconfig.defaultFonts = {
+        monospace = [ "CaskaydiaMono Nerd Font" ];
+        sansSerif = [ "DejaVu Sans" "Noto Sans CJK JP" "Noto Sans" ];
+        serif = [ "DejaVu Serif" "Noto Serif CJK JP" "Noto Serif" ];
+      };
+    };
+  };
+}
diff --git a/snowfall/modules/nixos/system/impermanence/default.nix b/snowfall/modules/nixos/system/impermanence/default.nix
new file mode 100644
index 0000000..cf3f697
--- /dev/null
+++ b/snowfall/modules/nixos/system/impermanence/default.nix
@@ -0,0 +1,27 @@
+{ options, config, lib, namespace, ... }:
+
+with lib; with lib.${namespace}; let
+  cfg = config.${namespace}.system.impermanence;
+in {
+  options.${namespace}.system.impermanence = with types; {
+    enable = mkEnableOption "root impermanence";
+  };
+
+  config = mkIf cfg.enable {
+    environment.persistence."/persist/system" = {
+      hideMounts = true;
+
+      directories = [
+        "/etc/nixos"
+        "/var/log"
+        "/var/lib/nixos"
+        "/var/lib/systemd/coredump"
+        # "/var/lib/bluetooth"
+      ];
+      
+      files = [
+        "/etc/machine-id"
+      ];
+    };
+  };
+}
diff --git a/snowfall/systems/x86_64-linux/c-pc/default.nix b/snowfall/systems/x86_64-linux/c-pc/default.nix
index 5301ed8..8006e7b 100644
--- a/snowfall/systems/x86_64-linux/c-pc/default.nix
+++ b/snowfall/systems/x86_64-linux/c-pc/default.nix
@@ -10,7 +10,12 @@ with lib; with lib.${namespace}; {
     system = {
       hostname = "c-pc";
       id = "23ce94ff";
-      impermanent = true;
+      
+      impermanence.enable = true;
+
+      fonts.extra = with pkgs; [
+        minecraftia
+      ];
     };
 
     suites = {
@@ -19,10 +24,6 @@ with lib; with lib.${namespace}; {
       gaming.enable = true;
     };
 
-    fonts.extra = with pkgs; [
-      minecraftia
-    ];
-
     apps.i3 = {
       videoDrivers = [ "amdgpu" ];
       setupCommands = ''
-- 
cgit v1.2.3