Desktop update

1 files changed, 10 insertions, 4 deletions

diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 28a3b7f..756a894 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -36,6 +36,10 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
     #readOnlyNixStore = false;
   };
 
+  environment.sessionVariables = {
+    ZSH_DISABLE_COMPFIX = "true";
+  };
+
   services.udev.extraRules = ''
     #SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="users"
     # SDP protocol
@@ -73,12 +77,14 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
 
   services = {
     xserver = {
+      displayManager.gdm.enable = true;
+      displayManager.lightdm.enable = false;
       enable = true;
       updateDbusEnvironment = true;
-      libinput.enable = true;
-      layout = "us";
+      xkb.layout = "us";
       wacom.enable = true;
     };
+    libinput.enable = true;
     
     openssh = {
       enable = true;
@@ -185,7 +191,7 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
         };
       };
       xdgOpenUsePortal = true;
-      gtkUsePortal = true;
+      #gtkUsePortal = true; # deprecated
 
     };
     #sounds.enable = true;
@@ -195,7 +201,7 @@ args@{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
     #autostart.enable = true;
   };
   fonts = {
-    fonts = with pkgs; [
+    packages = with pkgs; [
       (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
       noto-fonts-monochrome-emoji
     ];