migration: split system config and move fonts to system

3 files changed, 65 insertions, 20 deletions

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"
+      ];
+    };
+  };
+}