1
0
mirror of https://github.com/kmein/niveum synced 2026-03-19 11:31:09 +01:00

improvement: use builtins.toJSON wherever possible

This commit is contained in:
Kierán Meinhardt
2019-09-11 07:34:18 +02:00
parent ddb465367e
commit 4d28abff2a
2 changed files with 81 additions and 67 deletions

View File

@@ -10,14 +10,14 @@
:set -Wall :set -Wall
''; '';
# :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\"" # :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
".stack/config.yaml".text = let user = config.niveum.user; in '' ".stack/config.yaml".text = let user = config.niveum.user; in builtins.toJSON {
templates: templates.params = {
params: author-name = user.name;
author-name: ${user.name} author-email = user.email;
author-email: ${user.email} copyright = "Copyright: (c) 2019 ${user.name}";
copyright: 'Copyright: (c) 2019 ${user.name}' github-username = user.github;
github-username: ${user.github} };
''; };
}; };
services.hoogle = { services.hoogle = {

View File

@@ -7,65 +7,79 @@ let
wilde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde"; wilde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde";
}; };
unstable = import <nixos-unstable> {}; unstable = import <nixos-unstable> {};
wtf-config = pkgs.writeText "config.yml" '' wtf-config = pkgs.writeText "config.yml" (builtins.toJSON {
wtf: wtf = {
colors: colors = {
background: black background = "black";
border: border = {
focusable: darkslateblue focusable = "darkslateblue";
focused: orange focused = "orange";
normal: gray normal = "gray";
grid: };
columns: [40, 54] };
rows: [10, 20] grid = {
refreshInterval: 1 columns = [40 54];
mods: rows = [10 20];
clocks: };
colors: refreshInterval = 1;
rows: mods = {
even: "lightblue" clocks = {
odd: "white" colors.rows = {
enabled: true even = "lightblue";
locations: odd = "white";
Berlin: Europe/Berlin };
London: Europe/London enabled = true;
Moscow: Europe/Moscow locations = {
New York: America/New York "Berlin" = "Europe/Berlin";
position: "London" = "Europe/London";
top: 0 "Moscow" = "Europe/Moscow";
left: 0 "New York" = "America/New York";
height: 1 };
width: 1 position = {
refreshInterval: 15 top = 0;
sort: "alphabetical" left = 0;
security: height = 1;
enabled: true width = 1;
position: };
top: 1 refreshInterval = 15;
left: 0 sort = "alphabetical";
height: 1 };
width: 1 security = {
refreshInterval: 300 enabled = true;
prettyweather: position = {
enabled: true top = 1;
city: Berlin left = 0;
position: height = 1;
top: 0 width = 1;
left: 1 };
height: 1 refreshInterval = 300;
width: 1 };
refreshInterval: 3600 prettyweather = {
cmdrunner: enabled = true;
enabled: true city = "Berlin";
args: ["status"] position = {
cmd: traadfri top = 0;
position: left = 1;
top: 1 height = 1;
left: 1 width = 1;
height: 1 };
width: 1 refreshInterval = 300;
refreshInterval: 2 };
''; cmdrunner = {
enabled = true;
args = [ "status" ];
cmd = "traadfri";
position = {
top = 1;
left = 1;
height = 1;
width = 1;
};
refreshInterval = 2;
};
};
};
});
in { in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix