Skip to content

Commit

Permalink
Update flake inputs ⬆️
Browse files Browse the repository at this point in the history
  • Loading branch information
danth committed Jul 14, 2023
1 parent d3092be commit d14076e
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 48 deletions.
57 changes: 28 additions & 29 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
base16 = {
url = "github:SenchoPens/base16.nix";
inputs.nixpkgs.follows = "nixpkgs";
};

# Pinned due to https://github.com/SenchoPens/base16.nix/issues/7
base16.url = "github:SenchoPens/base16.nix/f493d8a8a6b4c1d814790e2189f26d4bcf433185";

# Used for documentation
home-manager = {
Expand Down
2 changes: 1 addition & 1 deletion modules/bat/hm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let
themeFile = config.lib.stylix.colors {
template = builtins.readFile ./base16-stylix.mustache;
template = ./base16-stylix.mustache;
extension = ".tmTheme";
};
in
Expand Down
2 changes: 1 addition & 1 deletion modules/gedit/hm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let
style = config.lib.stylix.colors {
template = builtins.readFile ./template.mustache;
template = ./template.mustache;
extension = "xml";
};

Expand Down
2 changes: 1 addition & 1 deletion modules/gnome/theme.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

let
colors = config.lib.stylix.colors {
template = builtins.readFile ./colors.mustache;
template = ./colors.mustache;
extension = "scss";
};

Expand Down
2 changes: 1 addition & 1 deletion modules/gtk/hm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ let
cfg = config.stylix.targets.gtk;

baseCss = config.lib.stylix.colors {
template = builtins.readFile ./gtk.mustache;
template = ./gtk.mustache;
extension = "css";
};

Expand Down
2 changes: 1 addition & 1 deletion modules/vscode/hm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ with config.stylix.fonts;

let
themeFile = config.lib.stylix.colors {
template = builtins.readFile ./template.mustache;
template = ./template.mustache;
extension = ".json";
};

Expand Down
6 changes: 3 additions & 3 deletions stylix/darwin/palette.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ args:
# when the theme is manually specified. generated.json is necessary in
# the presence of overrides.
"stylix/generated.json".source = config.lib.stylix.scheme {
template = builtins.readFile ../palette.json.mustache;
template = ../palette.json.mustache;
extension = ".json";
};

"stylix/palette.json".source = config.lib.stylix.colors {
template = builtins.readFile ../palette.json.mustache;
template = ../palette.json.mustache;
extension = ".json";
};

# We also provide a HTML version which is useful for viewing the colors
# during development.
"stylix/palette.html".source = config.lib.stylix.colors {
template = builtins.readFile ../palette.html.mustache;
template = ../palette.html.mustache;
extension = ".html";
};
};
Expand Down
6 changes: 3 additions & 3 deletions stylix/hm/palette.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ args:
xdg.configFile = {
# See ../nixos/palette.nix for the rational behind these two options
"stylix/generated.json".source = config.lib.stylix.scheme {
template = builtins.readFile ../palette.json.mustache;
template = ../palette.json.mustache;
extension = ".json";
};
"stylix/palette.json".source = config.lib.stylix.colors {
template = builtins.readFile ../palette.json.mustache;
template = ../palette.json.mustache;
extension = ".json";
};
"stylix/palette.html".source = config.lib.stylix.colors {
template = builtins.readFile ../palette.html.mustache;
template = ../palette.html.mustache;
extension = ".html";
};
};
Expand Down
6 changes: 3 additions & 3 deletions stylix/nixos/palette.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ args:
# when the theme is manually specified. generated.json is necessary in
# the presence of overrides.
"stylix/generated.json".source = config.lib.stylix.scheme {
template = builtins.readFile ../palette.json.mustache;
template = ../palette.json.mustache;
extension = ".json";
};

"stylix/palette.json".source = config.lib.stylix.colors {
template = builtins.readFile ../palette.json.mustache;
template = ../palette.json.mustache;
extension = ".json";
};

# We also provide a HTML version which is useful for viewing the colors
# during development.
"stylix/palette.html".source = config.lib.stylix.colors {
template = builtins.readFile ../palette.html.mustache;
template = ../palette.html.mustache;
extension = ".html";
};
};
Expand Down
2 changes: 1 addition & 1 deletion stylix/palette.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let
palette = importJSON generatedJSON;
scheme = base16.mkSchemeAttrs palette;
json = scheme {
template = builtins.readFile ./palette.json.mustache;
template = ./palette.json.mustache;
extension = ".json";
};
in json;
Expand Down

0 comments on commit d14076e

Please sign in to comment.