From e8077fde966e051fc449fffcfa061c7f7edc47b0 Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Mon, 14 Apr 2025 19:01:38 -0700 Subject: migration: finalize --- modules/nixos/system/default.nix | 30 ++++++++++++++++ modules/nixos/system/fonts/default.nix | 38 +++++++++++++++++++++ modules/nixos/system/impermanence/default.nix | 49 +++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 modules/nixos/system/default.nix create mode 100644 modules/nixos/system/fonts/default.nix create mode 100644 modules/nixos/system/impermanence/default.nix (limited to 'modules/nixos/system') diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix new file mode 100644 index 0000000..96c5654 --- /dev/null +++ b/modules/nixos/system/default.nix @@ -0,0 +1,30 @@ +{ options, config, lib, namespace, ... }: + +with lib; with lib.${namespace}; let + cfg = config.${namespace}.system; +in { + options.${namespace}.system = with types; { + hostname = mkOption { + type = strMatching "^$|^[[:alnum:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$"; + }; + + id = mkOption { + default = null; + type = nullOr str; + }; + + timezone = mkOption { + default = "America/Los_Angeles"; + type = nullOr str; + }; + }; + + config = { + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + networking.hostName = cfg.hostname; + networking.hostId = cfg.id; + + time.timeZone = cfg.timezone; + }; +} diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix new file mode 100644 index 0000000..c510679 --- /dev/null +++ b/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 ( + 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/modules/nixos/system/impermanence/default.nix b/modules/nixos/system/impermanence/default.nix new file mode 100644 index 0000000..b82579b --- /dev/null +++ b/modules/nixos/system/impermanence/default.nix @@ -0,0 +1,49 @@ +{ 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"; + + location = mkOption { + type = str; + default = "/persist/system"; + }; + + #TODO: multi-user support + home = { + enable = mkEnableOption "home impermanence"; + + location = mkOption { + type = str; + default = "/persist/home"; + }; + + secure.location = mkOption { + type = str; + default = "/persist/secure/home"; + }; + }; + }; + + config = mkIf cfg.enable { + programs.fuse.userAllowOther = true; + + environment.persistence.${cfg.location} = { + hideMounts = true; + + directories = [ + "/etc/nixos" + "/var/log" + "/var/lib/nixos" + "/var/lib/systemd/coredump" + # "/var/lib/bluetooth" + ]; + + files = [ + "/etc/machine-id" + ]; + }; + }; +} -- cgit v1.2.3