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,14 +2,16 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
inherit (config.rose-pine) sources;
|
inherit (config.rose-pine) sources;
|
||||||
|
|
||||||
cfg = config.console.rose-pine;
|
cfg = config.console.rose-pine;
|
||||||
enable = cfg.enable && config.console.enable;
|
enable = cfg.enable && config.console.enable;
|
||||||
|
|
||||||
palette = (lib.importJSON "${sources.rose-pine-palette}/palette.json").${cfg.flavor}.colors;
|
palette = (lib.importJSON "${sources.rose-pine-palette}/palette.json").${cfg.flavor}.colors;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.console.rose-pine = lib.rp.mkRosePineOpt { name = "console"; };
|
options.console.rose-pine = lib.rp.mkRosePineOpt { name = "console"; };
|
||||||
|
|
||||||
config.console.colors = lib.mkIf enable (
|
config.console.colors = lib.mkIf enable (
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{lib, ...}: {
|
{ lib, ... }:
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
assertions = [ (lib.rp.assertMinimumVersion "24.05") ];
|
assertions = [ (lib.rp.assertMinimumVersion "24.05") ];
|
||||||
};
|
};
|
||||||
|
@ -18,7 +19,8 @@
|
||||||
description = "Global Rosé Pine accent";
|
description = "Global Rosé Pine accent";
|
||||||
};
|
};
|
||||||
|
|
||||||
sources = let
|
sources =
|
||||||
|
let
|
||||||
defaultSources = import ../../.sources;
|
defaultSources = import ../../.sources;
|
||||||
in
|
in
|
||||||
lib.mkOption {
|
lib.mkOption {
|
||||||
|
|
|
@ -2,12 +2,14 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
inherit (config.rose-pine) sources;
|
inherit (config.rose-pine) sources;
|
||||||
|
|
||||||
cfg = config.boot.loader.grub.rose-pine;
|
cfg = config.boot.loader.grub.rose-pine;
|
||||||
enable = cfg.enable && config.boot.loader.grub.enable;
|
enable = cfg.enable && config.boot.loader.grub.enable;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.boot.loader.grub.rose-pine = lib.rp.mkRosePineOpt { name = "grub"; };
|
options.boot.loader.grub.rose-pine = lib.rp.mkRosePineOpt { name = "grub"; };
|
||||||
|
|
||||||
config.boot.loader.grub = lib.mkIf enable {
|
config.boot.loader.grub = lib.mkIf enable {
|
||||||
|
|
|
@ -3,11 +3,14 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
inherit (config.rose-pine) sources;
|
inherit (config.rose-pine) sources;
|
||||||
|
|
||||||
cfg = config.services.displayManager.sddm.rose-pine;
|
cfg = config.services.displayManager.sddm.rose-pine;
|
||||||
enable = cfg.enable && config.services.displayManager.sddm.enable;
|
enable = cfg.enable && config.services.displayManager.sddm.enable;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
options.services.displayManager.sddm.rose-pine = lib.rp.mkRosePineOpt { name = "sddm"; };
|
options.services.displayManager.sddm.rose-pine = lib.rp.mkRosePineOpt { name = "sddm"; };
|
||||||
|
|
||||||
config = lib.mkIf enable {
|
config = lib.mkIf enable {
|
||||||
|
|
Loading…
Reference in a new issue