Merge branch 'master' of https://gitea.nyanlout.re/nyanloutre/nixos-config

systems/PC-Fixe/configuration.nix

@@ -84,6 +84,8 @@
 
   networking.firewall.enable = false;
 
+  services.displayManager.autoLogin.user = "paul";
+
   users.users.paul = {
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" "wireshark" "input" "dialout" "libvirtd" "vboxusers" ];
@@ -100,6 +102,10 @@
     X11Forwarding = true;
   };
 
+  services.xserver.deviceSection = ''
+    Option "metamodes" "DP-4: 3440x1440_144 +0+0 {AllowGSYNCCompatible=On}"
+  '';
+
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.hplip ];
 

systems/PC-Fixe/hardware-configuration.nix

@@ -13,7 +13,6 @@
   hardware.cpu.amd.updateMicrocode = true;
   hardware.nvidia = {
     modesetting.enable = true;
-    nvidiaSettings = false;
   };
 
   fileSystems."/" =

systems/common-gui.nix

@@ -48,6 +48,8 @@
       inherit (texlive) scheme-small titling collection-langfrench cm-super;
     })
 
+    libsForQt5.breeze-gtk
+
     libreoffice
 
     gimp
@@ -97,15 +99,20 @@
   };
 
   services = {
-    desktopManager.plasma6.enable = true;
+    # desktopManager.plasma6.enable = true;
     displayManager = {
-      autoLogin.user = "paul";
       sddm = {
         enable = true;
-        wayland.enable = true;
+        # wayland.enable = true;
         autoLogin.relogin = true;
       };
     };
+    xserver = {
+      enable = true;
+      xkb.layout = "fr";
+      exportConfiguration = true;
+      desktopManager.plasma5.enable = true;
+    };
     udev.packages = with pkgs; [ ledger-udev-rules ];
     pcscd.enable = true;
   };