Stylix: Cut the fuck out predefined color schemes support.
This commit is contained in:
parent
3e3e41a440
commit
69ab1d9ad3
38
flake.nix
38
flake.nix
|
@ -194,21 +194,25 @@
|
|||
++ (ls ./system);
|
||||
specialArgs =
|
||||
let
|
||||
util = import ./lib/Util.nix { inherit lib; };
|
||||
in
|
||||
{
|
||||
inherit
|
||||
const
|
||||
__findFile
|
||||
inputs
|
||||
self
|
||||
poetry2nixJobber
|
||||
util
|
||||
;
|
||||
pkgsJobber = nixpkgsJobber.legacyPackages.${system}.pkgs;
|
||||
pkgsMaster = nixpkgsMaster.legacyPackages.${system}.pkgs;
|
||||
pkgsUnstable = nixpkgsUnstable.legacyPackages.${system}.pkgs;
|
||||
secret = import ./secret { };
|
||||
util = import ./lib/Util.nix { inherit lib; };
|
||||
in
|
||||
{
|
||||
inherit
|
||||
__findFile
|
||||
const
|
||||
inputs
|
||||
pkgsJobber
|
||||
pkgsMaster
|
||||
pkgsUnstable
|
||||
poetry2nixJobber
|
||||
secret
|
||||
self
|
||||
util
|
||||
;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -240,7 +244,9 @@
|
|||
pkgs = nixpkgs.legacyPackages.${system}.pkgs;
|
||||
pkgsMaster = nixpkgsMaster.legacyPackages.${system}.pkgs;
|
||||
pkgsUnstable = nixpkgsUnstable.legacyPackages.${system}.pkgs;
|
||||
secret = import ./secret { };
|
||||
system = "aarch64-linux";
|
||||
util = import ./lib/Util.nix { inherit lib; };
|
||||
in
|
||||
nix-on-droid.lib.nixOnDroidConfiguration {
|
||||
inherit pkgs;
|
||||
|
@ -251,15 +257,15 @@
|
|||
] ++ (ls ./option);
|
||||
extraSpecialArgs = {
|
||||
inherit
|
||||
__findFile
|
||||
const
|
||||
inputs
|
||||
self
|
||||
pkgsMaster
|
||||
pkgsUnstable
|
||||
const
|
||||
__findFile
|
||||
secret
|
||||
self
|
||||
util
|
||||
;
|
||||
secret = import ./secret { };
|
||||
util = import ./lib/Util.nix { inherit lib; };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -4,19 +4,6 @@ let
|
|||
url = "https://i.imgur.com/KkZFMD3.png";
|
||||
sha256 = "sha256-cTNUeamZTjQDx8gGZkU1mj4kKS3FEE0+EDzFb5bsyZE=";
|
||||
forceContrastText = false;
|
||||
|
||||
# SEE: https://github.com/tinted-theming/schemes
|
||||
# Blue: "${pkgs.base16-schemes}/share/themes/moonlight.yaml"
|
||||
# Brown: "${pkgs.base16-schemes}/share/themes/sandcastle.yaml"
|
||||
# Classy: "${pkgs.base16-schemes}/share/themes/monokai.yaml"
|
||||
# Cold: "${pkgs.base16-schemes}/share/themes/nord.yaml"
|
||||
# Cool: "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"
|
||||
# Gray: "${pkgs.base16-schemes}/share/themes/nova.yaml"
|
||||
# Material: "${pkgs.base16-schemes}/share/themes/material.yaml"
|
||||
# Purple: "${pkgs.base16-schemes}/share/themes/shades-of-purple.yaml"
|
||||
# Retro: "${pkgs.base16-schemes}/share/themes/mocha.yaml"
|
||||
# Warm: "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"
|
||||
style = null;
|
||||
in
|
||||
{
|
||||
options.module.wallpaper = {
|
||||
|
@ -28,15 +15,5 @@ in
|
|||
default = pkgs.fetchurl { inherit url sha256; };
|
||||
type = lib.types.path;
|
||||
};
|
||||
style = lib.mkOption {
|
||||
default = style;
|
||||
type =
|
||||
with lib.types;
|
||||
nullOr (oneOf [
|
||||
path
|
||||
lines
|
||||
attrs
|
||||
]);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -32,10 +32,9 @@ in
|
|||
}
|
||||
// (lib.optionalAttrs wallpaper.forceContrastText {
|
||||
override = {
|
||||
base04 = lib.mkForce "000000";
|
||||
base05 = lib.mkForce "ffffff";
|
||||
base06 = lib.mkForce "ffffff";
|
||||
base04 = "000000";
|
||||
base05 = "ffffff";
|
||||
base06 = "ffffff";
|
||||
};
|
||||
})
|
||||
// (lib.optionalAttrs (wallpaper.style != null) { base16Scheme = wallpaper.style; });
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue