Update flake inputs ⬆️

This commit is contained in:
Daniel Thwaites 2023-07-14 12:50:08 +01:00
parent d3092bed02
commit d14076e46f
No known key found for this signature in database
GPG key ID: D8AFC4BF05670F9D
11 changed files with 46 additions and 48 deletions

View file

@ -2,21 +2,20 @@
"nodes": {
"base16": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1658847131,
"narHash": "sha256-X6Mml7cT0YR3WCD5fkUhpRVV5ZPcwdcDsND8r8xMqTE=",
"lastModified": 1687651793,
"narHash": "sha256-AjV/f/grsR4y6t0aUviXxjeLAEYmpE/4XE08IIPhHag=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "6b404cda2e04ca3cf5ca7b877af9c469e1386acb",
"rev": "f493d8a8a6b4c1d814790e2189f26d4bcf433185",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "f493d8a8a6b4c1d814790e2189f26d4bcf433185",
"type": "github"
}
},
@ -36,19 +35,34 @@
"type": "github"
}
},
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1685846909,
"narHash": "sha256-ibxtG018Qq2Qjxir4Hai3Gr1hOOa+ad4V0EbFaHOj9Y=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "706176e156923d963ead81fe6bfba041f057cc65",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
]
},
"locked": {
"lastModified": 1680000368,
"narHash": "sha256-TlgC4IJ7aotynUdkGRtaAVxquaiddO38Ws89nB7VGY8=",
"lastModified": 1689134369,
"narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "765e4007b6f9f111469a25d1df6540e8e0ca73a6",
"rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c",
"type": "github"
},
"original": {
@ -59,11 +73,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1679793451,
"narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
"lastModified": 1689261696,
"narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cd51a933d91078775b300cf0f29aa3495231aa2",
"rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github"
},
"original": {
@ -80,21 +94,6 @@
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
},
"utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

View file

@ -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 = {

View file

@ -2,7 +2,7 @@
let
themeFile = config.lib.stylix.colors {
template = builtins.readFile ./base16-stylix.mustache;
template = ./base16-stylix.mustache;
extension = ".tmTheme";
};
in

View file

@ -2,7 +2,7 @@
let
style = config.lib.stylix.colors {
template = builtins.readFile ./template.mustache;
template = ./template.mustache;
extension = "xml";
};

View file

@ -2,7 +2,7 @@
let
colors = config.lib.stylix.colors {
template = builtins.readFile ./colors.mustache;
template = ./colors.mustache;
extension = "scss";
};

View file

@ -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";
};

View file

@ -4,7 +4,7 @@ with config.stylix.fonts;
let
themeFile = config.lib.stylix.colors {
template = builtins.readFile ./template.mustache;
template = ./template.mustache;
extension = ".json";
};

View file

@ -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";
};
};

View file

@ -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";
};
};

View file

@ -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";
};
};

View file

@ -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;