-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fetch schemes from base16-project, reorganize lib
This is a major change, but the only breaking change is the lib function namespace. You can now use either nix-colors-style schemes, or base16 YAML schemes directly, using the new `schemeFromYAML` function. Opinionated functions have been moved into `lib-contrib`. base16 has moved to an org, so with that in mind we no longer need to vendor schemes here. Docs has been updated, and the repo was cleaned up from now-unneeded stuff. All occurences of "color(S|s)cheme(s)" have been normalized to "colorScheme(s)", with "colorscheme(s)" as aliases. Changelog: - Add `schemeFromYAML` and `schemeToYAML` functions. - These are pure nix, and allow us to finally use base16-project's `.yaml` schemes without requiring users to pass `pkgs` or specify `system`. - Use base16-project scheme repository. There is a scheme monorepo now, which makes our lives a lot easier - We no longer vendor schemes. - The schemes we previously had were upstreamed on tinted-theming/base16-schemes#1 - Move opinionated functions into `lib-contrib` - Update docs - Clean up repo
- Loading branch information
1 parent
fe9fd38
commit 81c0629
Showing
341 changed files
with
448 additions
and
8,447 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,28 @@ | ||
{ base16-schemes ? # If not defined (when not using flakes), download with fetchTarball (by lockfile info) | ||
let | ||
inherit (builtins) fromJSON readFile; | ||
inherit ((fromJSON (readFile ./flake.lock)).nodes.base16-schemes) locked; | ||
in | ||
fetchTarball { | ||
url = "https://github.com/${locked.owner}/${locked.repo}/archive/${locked.rev}.tar.gz"; | ||
sha256 = locked.narHash; | ||
} | ||
, ... | ||
}: | ||
rec { | ||
lib = import ./lib; | ||
colorSchemes = import ./schemes; | ||
homeManagerModules.colorscheme = import ./module; | ||
homeManagerModule = homeManagerModules.colorscheme; | ||
lib-contrib = import ./lib/contrib; | ||
lib-core = import ./lib/core; | ||
|
||
colorSchemes = import ./schemes.nix { inherit lib-core base16-schemes; }; | ||
# Alias | ||
colorschemes = colorSchemes; | ||
|
||
homeManagerModules = rec { | ||
colorScheme = import ./module; | ||
# Alias | ||
colorscheme = colorScheme; | ||
default = colorScheme; | ||
}; | ||
homeManagerModule = homeManagerModules.colorScheme; | ||
} |
Oops, something went wrong.