From 69ab1d9ad30233b16f260777d4544bccd06839f7 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sun, 29 Dec 2024 13:16:52 +0300 Subject: [PATCH] Stylix: Cut the fuck out predefined color schemes support. --- flake.nix | 38 ++++++++++++++++++++++---------------- option/Wallpaper.nix | 23 ----------------------- system/Stylix.nix | 9 ++++----- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/flake.nix b/flake.nix index 224bd5f..2442cbf 100644 --- a/flake.nix +++ b/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; }; }; }; }; diff --git a/option/Wallpaper.nix b/option/Wallpaper.nix index b619adf..de5d3ee 100644 --- a/option/Wallpaper.nix +++ b/option/Wallpaper.nix @@ -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 - ]); - }; }; } diff --git a/system/Stylix.nix b/system/Stylix.nix index 80f1422..565ec7e 100644 --- a/system/Stylix.nix +++ b/system/Stylix.nix @@ -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; }); + }); }