refactor(nixos): Use new helpers; formatting
Some checks are pending
CI / Format Nix files (push) Waiting to run
CI / Test Modules (push) Waiting to run
CI / Validate sources (push) Waiting to run
Release / Make release (push) Waiting to run
Release / Publish to Flake registries (push) Blocked by required conditions
Build & deploy website / Build site (push) Waiting to run
Build & deploy website / Deploy website (push) Blocked by required conditions
Some checks are pending
CI / Format Nix files (push) Waiting to run
CI / Test Modules (push) Waiting to run
CI / Validate sources (push) Waiting to run
Release / Make release (push) Waiting to run
Release / Publish to Flake registries (push) Blocked by required conditions
Build & deploy website / Build site (push) Waiting to run
Build & deploy website / Deploy website (push) Blocked by required conditions
This commit is contained in:
parent
ebc1dbcd69
commit
f26b1be83f
4 changed files with 24 additions and 15 deletions
|
@ -2,15 +2,17 @@
|
|||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (config.rose-pine) sources;
|
||||
|
||||
cfg = config.console.rose-pine;
|
||||
enable = cfg.enable && config.console.enable;
|
||||
|
||||
palette = (lib.importJSON "${sources.rose-pine-palette}/palette.json").${cfg.flavor}.colors;
|
||||
in {
|
||||
options.console.rose-pine = lib.rp.mkRosePineOpt {name = "console";};
|
||||
in
|
||||
{
|
||||
options.console.rose-pine = lib.rp.mkRosePineOpt { name = "console"; };
|
||||
|
||||
config.console.colors = lib.mkIf enable (
|
||||
# Manually populate with colors from rose-pine/linux-tty
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{lib, ...}: {
|
||||
{ lib, ... }:
|
||||
{
|
||||
config = {
|
||||
assertions = [(lib.rp.assertMinimumVersion "24.05")];
|
||||
assertions = [ (lib.rp.assertMinimumVersion "24.05") ];
|
||||
};
|
||||
|
||||
options.rose-pine = {
|
||||
|
@ -18,9 +19,10 @@
|
|||
description = "Global Rosé Pine accent";
|
||||
};
|
||||
|
||||
sources = let
|
||||
defaultSources = import ../../.sources;
|
||||
in
|
||||
sources =
|
||||
let
|
||||
defaultSources = import ../../.sources;
|
||||
in
|
||||
lib.mkOption {
|
||||
type = lib.types.lazyAttrsOf lib.types.raw;
|
||||
default = defaultSources;
|
||||
|
|
|
@ -2,13 +2,15 @@
|
|||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (config.rose-pine) sources;
|
||||
|
||||
cfg = config.boot.loader.grub.rose-pine;
|
||||
enable = cfg.enable && config.boot.loader.grub.enable;
|
||||
in {
|
||||
options.boot.loader.grub.rose-pine = lib.rp.mkRosePineOpt {name = "grub";};
|
||||
in
|
||||
{
|
||||
options.boot.loader.grub.rose-pine = lib.rp.mkRosePineOpt { name = "grub"; };
|
||||
|
||||
config.boot.loader.grub = lib.mkIf enable {
|
||||
theme = sources.grub;
|
||||
|
|
|
@ -3,18 +3,21 @@
|
|||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (config.rose-pine) sources;
|
||||
|
||||
cfg = config.services.displayManager.sddm.rose-pine;
|
||||
enable = cfg.enable && config.services.displayManager.sddm.enable;
|
||||
in {
|
||||
options.services.displayManager.sddm.rose-pine = lib.rp.mkRosePineOpt {name = "sddm";};
|
||||
in
|
||||
{
|
||||
options.services.displayManager.sddm.rose-pine = lib.rp.mkRosePineOpt { name = "sddm"; };
|
||||
|
||||
config = lib.mkIf enable {
|
||||
services.displayManager.sddm.theme = "rose-pine";
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.callPackage ./sddm-rose-pine-pkg.nix {inherit sources;})
|
||||
(pkgs.callPackage ./sddm-rose-pine-pkg.nix { inherit sources; })
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue