[STYLE/REFACTOR] Deadnix, Alejandra and Statix

This commit is contained in:
Kat Inskip 2023-04-25 16:48:32 -07:00
parent 8573c4508d
commit d4242f9dd8
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
51 changed files with 465 additions and 466 deletions

View file

@ -1,59 +1,74 @@
{ config, pkgs, lib, ... }: let
{
config,
pkgs,
lib,
...
}: let
inherit (lib.types) attrsOf str enum;
inherit (lib.modules) mkIf;
cfg = config.base16;
in with lib; {
options.base16 = {
palette = mkOption {
type = attrsOf str;
};
sass = {
variables = mkOption {
in
with lib; {
options.base16 = {
palette = mkOption {
type = attrsOf str;
default = cfg.palette // {
term_font = "Iosevka";
font = "Iosevka";
font_size = "12px";
};
sass = {
variables = mkOption {
type = attrsOf str;
default =
cfg.palette
// {
term_font = "Iosevka";
font = "Iosevka";
font_size = "12px";
};
};
css_style = mkOption {
type = enum ["nested" "compressed" "compact" "expanded"];
default = "expanded";
};
};
css_style = mkOption {
type = enum [ "nested" "compressed" "compact" "expanded" ];
default = "expanded";
};
config = mkIf (cfg.schemes != {}) {
base16 = {
# TODO: convert to std
palette =
lib.mapAttrs' (k: v:
lib.nameValuePair
k
"#${v.hex}")
(lib.filterAttrs (n: _: lib.hasInfix "base" n)
cfg.defaultScheme);
};
};
};
config = mkIf (cfg.schemes != {}) {
base16 = {
# TODO: convert to std
palette = lib.mapAttrs' (k: v:
lib.nameValuePair
k
"#${v.hex}")
(lib.filterAttrs (n: _: lib.hasInfix "base" n)
cfg.defaultScheme);
};
lib.kittywitch.sassTemplate = { name, src }:
let
lib.kittywitch.sassTemplate = {
name,
src,
}: let
variables = pkgs.writeText "base-variables.sass" ''
${(concatStringsSep "\n" (mapAttrsToList(var: con: "\$${var}: ${con}") cfg.sass.variables))}
${(concatStringsSep "\n" (mapAttrsToList (var: con: "\$${var}: ${con}") cfg.sass.variables))}
'';
source = pkgs.callPackage
({ sass, stdenv }: stdenv.mkDerivation {
inherit name src variables;
nativeBuildInputs = lib.singleton pkgs.sass;
phases = [ "buildPhase" ];
buildPhase = ''
cat $variables $src > src-mut.sass
sass src-mut.sass $out --sourcemap=none --trace --style=${cfg.sass.css_style}
'';
})
{ };
in
{
source =
pkgs.callPackage
({
sass,
stdenv,
}:
stdenv.mkDerivation {
inherit name src variables;
nativeBuildInputs = lib.singleton pkgs.sass;
phases = ["buildPhase"];
buildPhase = ''
cat $variables $src > src-mut.sass
sass src-mut.sass $out --sourcemap=none --trace --style=${cfg.sass.css_style}
'';
})
{};
in {
inherit source;
text = builtins.readFile source;
};
_module.args = { inherit (config.lib) kittywitch; };
};
}
_module.args = {inherit (config.lib) kittywitch;};
};
}

View file

@ -1,7 +1,12 @@
{ config, lib, ... }: let
{
config,
lib,
...
}: let
inherit (lib.modules) mkIf;
in mkIf (config.programs.waybar.enable) {
systemd.user.services.waybar.Unit.X-Restart-Triggers = [
(builtins.toString config.programs.waybar.style)
];
}
in
mkIf config.programs.waybar.enable {
systemd.user.services.waybar.Unit.X-Restart-Triggers = [
(builtins.toString config.programs.waybar.style)
];
}

View file

@ -1,8 +1,4 @@
{
config,
lib,
...
}: let
{lib, ...}: let
inherit (lib.types) listOf path;
inherit (lib.options) mkOption;
in {