From 6d998c3f8c7960338621bd5317522249ca234d70 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 15 Sep 2023 15:01:13 +0200
Subject: fix wayland on nvidia; fix keyboard layout on kde wayland

---
 nixos/common.nix | 12 ++++++++++--
 nixos/kde.nix    |  1 -
 nixos/lindy.nix  |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'nixos')

diff --git a/nixos/common.nix b/nixos/common.nix
index 41c2f3f..bcecd32 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -75,9 +75,17 @@ in
   services.xserver.enable = true;
 
   # Configure keymap in X11
-  services.xserver.layout = "fr";
-  services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledXkbLayout} $DISPLAY";
+  services.xserver.layout = "fr-custom-lx";
+  #services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledXkbLayout} $DISPLAY";
   services.xserver.xkbOptions = "caps:escape";
+  services.xserver.extraLayouts."fr-custom-lx" = {
+    description = "French (LX custom azerty)";
+    languages = ["fre"];
+    symbolsFile = ../xkb/symbols/fr-custom-lx;
+    compatFile = ../xkb/compat/fr-custom-lx;
+    typesFile = ../xkb/types/fr-custom-lx;
+    keycodesFile = ../xkb/keycodes/fr-custom-lx;
+  };
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
diff --git a/nixos/kde.nix b/nixos/kde.nix
index 3703ae9..51fb9af 100644
--- a/nixos/kde.nix
+++ b/nixos/kde.nix
@@ -1,6 +1,5 @@
 { config, pkgs, ... }: {
   services.xserver.displayManager.sddm.enable = true;
-  #services.xserver.displayManager.lightdm.enable = true;
   services.xserver.desktopManager.plasma5.enable = true;
 
   environment.systemPackages = with pkgs.libsForQt5; [
diff --git a/nixos/lindy.nix b/nixos/lindy.nix
index 6907e82..760b656 100644
--- a/nixos/lindy.nix
+++ b/nixos/lindy.nix
@@ -83,6 +83,8 @@ Kogami UUID=61534c91-df18-4c71-9244-54e677f5d4fa /root/kogami_key
   services.cron.systemCronJobs = [ "0 20 * * * root /media/Zonz/lindy/do-backup.sh" ];
 
   # Nvidia graphics
+  boot.kernelParams = [ "i915.modeset=0" ];
+  hardware.nvidia.modesetting.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.opengl.enable = true;
 
-- 
cgit v1.2.3