all repos — nixfiles @ 2460a54df4acd9860635a4e1cf5427187a670616

System and user configuration, managed by nix and home-manager

fix evaluation errors

Alan Pearce
commit

2460a54df4acd9860635a4e1cf5427187a670616

parent

297404c8be8b79762fc99bf47df425eaa7b81ff7

M modules/berlin.nixmodules/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"; };
M modules/colemak.nixmodules/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-variant=colemak
xkb-options="altwin:prtsc_rwin" ''; }; - xserver = { + services.xserver = { layout = "us,us"; xkbVariant = "colemak,"; xkbOptions = "grp:shifts_toggle,altwin:prtsc_rwin";
M modules/satoshipay.nixmodules/satoshipay.nix
@@ -17,7 +17,7 @@ environment.systemPackages = with pkgs; [
google-chrome mongodb franz - pkgsUnstable.scudCloud + pkgsUnstable.scudcloud ]; networking.domain = "satoshipay.io";
M modules/user-interface.nixmodules/user-interface.nix
@@ -40,7 +40,7 @@
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 {