diff options
| -rw-r--r-- | nixos/common.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/common.nix | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/nixos/common.nix b/nixos/common.nix index a967e7d..84b5a17 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -1,5 +1,11 @@ { config, pkgs, ... }: +let + compiledXkbLayout = pkgs.runCommand "keyboard-layout" {} '' + ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../xkb/symbols/custom-fr} $out + ''; +in + { boot.supportedFilesystems = [ "ntfs" ]; boot.cleanTmpDir = true; @@ -23,8 +29,7 @@ console = { font = "sun12x22"; - #keyMap = "fr"; - useXkbConfig = true; # use xkbOptions in tty. + keyMap = "fr"; }; # Enable the X11 windowing system. @@ -32,6 +37,7 @@ # Configure keymap in X11 services.xserver.layout = "fr"; + services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledXkbLayout} $DISPLAY"; services.xserver.xkbOptions = "caps:escape"; # Enable CUPS to print documents. diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix index 75d2ce5..ec0ff5b 100644 --- a/nixpkgs/common.nix +++ b/nixpkgs/common.nix @@ -31,6 +31,7 @@ home.file = { ".config/tmux/tmux.conf".source = ../tmux/tmux.conf; }; xsession.enable = true; + home.keyboard = null; xdg.enable = true; xdg.userDirs = { |