From 132bc369a00533ba8ea077ef91a6f5e7cb6dc752 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 10 Jun 2024 15:22:23 +0800 Subject: [PATCH] nixos: instant more fun https://github.com/NixOS/nixpkgs/issues/315574 --- nixos/profiles/common/core/default.nix | 11 +---------- nixos/profiles/common/core/fun.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 nixos/profiles/common/core/fun.nix diff --git a/nixos/profiles/common/core/default.nix b/nixos/profiles/common/core/default.nix index cdcdf55..84e8e78 100644 --- a/nixos/profiles/common/core/default.nix +++ b/nixos/profiles/common/core/default.nix @@ -10,6 +10,7 @@ ./hardening ./networking ./nix + ./fun.nix ] ++ (with inputs; [ aagl.nixosModules.default @@ -62,16 +63,6 @@ settings.PasswordAuthentication = false; }; - services.getty.greetingLine = let - inherit (config.system) nixos; - in '' - NixOS ${nixos.label} ${nixos.codeName} (\m) - \l - ${lib.strings.optionalString (builtins.elem "nvidia" config.services.xserver.videoDrivers) - "--my-next-gpu-wont-be-nvidia"} - ${lib.strings.optionalString (builtins.elem "amdgpu" config.boot.initrd.kernelModules) - "[ 5.996722] amdgpu 0000:67:00.0: Fatal error during GPU init"} - ''; - users.users = rec { "guanranwang" = { isNormalUser = true; diff --git a/nixos/profiles/common/core/fun.nix b/nixos/profiles/common/core/fun.nix new file mode 100644 index 0000000..4480ce8 --- /dev/null +++ b/nixos/profiles/common/core/fun.nix @@ -0,0 +1,24 @@ +{ + lib, + config, + ... +}: { + options = { + system.nixos.codeName = lib.mkOption {readOnly = false;}; + }; + + config = { + # https://github.com/NixOS/nixpkgs/issues/315574 + system.nixos.codeName = "骆马"; + + services.getty.greetingLine = let + inherit (config.system) nixos; + in '' + NixOS ${nixos.label} ${nixos.codeName} (\m) - \l + ${lib.strings.optionalString (builtins.elem "nvidia" config.services.xserver.videoDrivers) + "--my-next-gpu-wont-be-nvidia"} + ${lib.strings.optionalString (builtins.elem "amdgpu" config.boot.initrd.kernelModules) + "[ 5.996722] amdgpu 0000:67:00.0: Fatal error during GPU init"} + ''; + }; +}