diff options
| author | Alan Pearce | 2017-09-09 17:01:46 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-09-09 17:01:46 +0200 |
| commit | 2460a54df4acd9860635a4e1cf5427187a670616 (patch) | |
| tree | ecdf28cfd0ef69dfaa05649570d177abe6b19e88 | |
| parent | 297404c8be8b79762fc99bf47df425eaa7b81ff7 (diff) | |
| download | nixfiles-2460a54df4acd9860635a4e1cf5427187a670616.tar.lz nixfiles-2460a54df4acd9860635a4e1cf5427187a670616.tar.zst nixfiles-2460a54df4acd9860635a4e1cf5427187a670616.zip | |
fix evaluation errors
| -rw-r--r-- | modules/berlin.nix | 4 | ||||
| -rw-r--r-- | modules/colemak.nix | 4 | ||||
| -rw-r--r-- | modules/satoshipay.nix | 2 | ||||
| -rw-r--r-- | modules/user-interface.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/berlin.nix b/modules/berlin.nix index a388a57a..246510c4 100644 --- a/modules/berlin.nix +++ b/modules/berlin.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: -{ time.timezone = "Europe/Berlin"; - redshift = { +{ time.timeZone = "Europe/Berlin"; + services.redshift = { latitude = "52.586"; longitude = "13.300"; }; diff --git a/modules/colemak.nix b/modules/colemak.nix index 53a4901e..3b1c0582 100644 --- a/modules/colemak.nix +++ b/modules/colemak.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { i18n.consoleKeyMap = "colemak/en-latin9"; - kmscon = { + services.kmscon = { extraConfig = '' xkb-model=pc104 xkb-layout=us @@ -9,7 +9,7 @@ xkb-options="altwin:prtsc_rwin" ''; }; - xserver = { + services.xserver = { layout = "us,us"; xkbVariant = "colemak,"; xkbOptions = "grp:shifts_toggle,altwin:prtsc_rwin"; diff --git a/modules/satoshipay.nix b/modules/satoshipay.nix index 70053038..178d67a4 100644 --- a/modules/satoshipay.nix +++ b/modules/satoshipay.nix @@ -17,7 +17,7 @@ in google-chrome mongodb franz - pkgsUnstable.scudCloud + pkgsUnstable.scudcloud ]; networking.domain = "satoshipay.io"; diff --git a/modules/user-interface.nix b/modules/user-interface.nix index d83a601a..cae4b6b9 100644 --- a/modules/user-interface.nix +++ b/modules/user-interface.nix @@ -40,7 +40,7 @@ in services.emacs = { enable = true; defaultEditor = true; - package = import ./emacs.nix { + package = import ../packages/emacs.nix { inherit (pkgs) stdenv; pkgs = pkgsUnstable; emacs = pkgs.lib.overrideDerivation (pkgs.emacs.override { |