diff --git a/configs/packages/haskell/default.nix b/configs/packages/haskell/default.nix index f019725..47dadd2 100644 --- a/configs/packages/haskell/default.nix +++ b/configs/packages/haskell/default.nix @@ -10,14 +10,14 @@ :set -Wall ''; # :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\"" - ".stack/config.yaml".text = let user = config.niveum.user; in '' - templates: - params: - author-name: ${user.name} - author-email: ${user.email} - copyright: 'Copyright: (c) 2019 ${user.name}' - github-username: ${user.github} - ''; + ".stack/config.yaml".text = let user = config.niveum.user; in builtins.toJSON { + templates.params = { + author-name = user.name; + author-email = user.email; + copyright = "Copyright: (c) 2019 ${user.name}"; + github-username = user.github; + }; + }; }; services.hoogle = { diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix index e238bb0..a8c770b 100644 --- a/systems/catullus/configuration.nix +++ b/systems/catullus/configuration.nix @@ -7,65 +7,79 @@ let wilde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde"; }; unstable = import {}; - wtf-config = pkgs.writeText "config.yml" '' - wtf: - colors: - background: black - border: - focusable: darkslateblue - focused: orange - normal: gray - grid: - columns: [40, 54] - rows: [10, 20] - refreshInterval: 1 - mods: - clocks: - colors: - rows: - even: "lightblue" - odd: "white" - enabled: true - locations: - Berlin: Europe/Berlin - London: Europe/London - Moscow: Europe/Moscow - New York: America/New York - position: - top: 0 - left: 0 - height: 1 - width: 1 - refreshInterval: 15 - sort: "alphabetical" - security: - enabled: true - position: - top: 1 - left: 0 - height: 1 - width: 1 - refreshInterval: 300 - prettyweather: - enabled: true - city: Berlin - position: - top: 0 - left: 1 - height: 1 - width: 1 - refreshInterval: 3600 - cmdrunner: - enabled: true - args: ["status"] - cmd: traadfri - position: - top: 1 - left: 1 - height: 1 - width: 1 - refreshInterval: 2 - ''; + wtf-config = pkgs.writeText "config.yml" (builtins.toJSON { + wtf = { + colors = { + background = "black"; + border = { + focusable = "darkslateblue"; + focused = "orange"; + normal = "gray"; + }; + }; + grid = { + columns = [40 54]; + rows = [10 20]; + }; + refreshInterval = 1; + mods = { + clocks = { + colors.rows = { + even = "lightblue"; + odd = "white"; + }; + enabled = true; + locations = { + "Berlin" = "Europe/Berlin"; + "London" = "Europe/London"; + "Moscow" = "Europe/Moscow"; + "New York" = "America/New York"; + }; + position = { + top = 0; + left = 0; + height = 1; + width = 1; + }; + refreshInterval = 15; + sort = "alphabetical"; + }; + security = { + enabled = true; + position = { + top = 1; + left = 0; + height = 1; + width = 1; + }; + refreshInterval = 300; + }; + prettyweather = { + enabled = true; + city = "Berlin"; + position = { + top = 0; + left = 1; + height = 1; + width = 1; + }; + refreshInterval = 300; + }; + cmdrunner = { + enabled = true; + args = [ "status" ]; + cmd = "traadfri"; + position = { + top = 1; + left = 1; + height = 1; + width = 1; + }; + refreshInterval = 2; + }; + }; + }; + }); in { imports = [ ./hardware-configuration.nix