From edde4a11d52394d87c9bbd61dcfdd172a7ea1de0 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Thu, 18 Jul 2019 21:24:55 +0000
Subject: [PATCH] Move keyboard settings to home-manager

---
 desktop.nix      | 4 ++--
 home-manager.nix | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/desktop.nix b/desktop.nix
index 9117cbb..ba4d45c 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -4,8 +4,8 @@ let
   secrets = import ./secrets.nix;
 in {
   services.xserver.enable = true;
-  services.xserver.layout = "us,ru";
-  services.xserver.xkbOptions = "ctrl:nocaps,grp:rctrl_toggle";
+  #services.xserver.layout = "us,ru"; # see home-manager.nix
+  #services.xserver.xkbOptions = "ctrl:nocaps,grp:rctrl_toggle"; # see home-manager.nix
   services.xserver.videoDrivers = [ "nvidia" ];
   services.xserver.windowManager.xmonad.enable = true;
   services.xserver.windowManager.xmonad.enableContribAndExtras = true;
diff --git a/home-manager.nix b/home-manager.nix
index 00ef474..749ed94 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -67,6 +67,11 @@ in {
       ".oh-my-zsh-custom/plugins/tmux-my/tmux-my.plugin.zsh".source = ./etc/tmux-my/tmux-my.plugin.zsh;
     };
 
+    home.keyboard = {
+      layout = "us,ru";
+      options = [ "ctrl:nocaps" "grp:rctrl_toggle" ];
+    };
+
     xsession.enable = true;
     xsession.windowManager.command = "exec xmonad";
   };