public-inbox: fix to support the current nixpkgs

[sourcephile-nix.git] / hosts / carotte / xserver.nix

diff --git a/hosts/carotte/xserver.nix b/hosts/carotte/xserver.nix
index 867fefe9159a7bbd3a1c7738c8b78b7aa34667db..15581a1726fe1ae244ee03c5be43df89096967fc 100644 (file)
--- a/hosts/carotte/xserver.nix
+++ b/hosts/carotte/xserver.nix
@@ -1,25 +1,27 @@
-{ pkgs, lib, config, hostName, ... }:
+{ pkgs, config, ... }:
 let inherit (config.users) users; in
 {
-services.xserver = {
-  enable = true;
-  layout = "fr,us(altgr-intl)";
-  xkbOptions = "eurosign:e, compose:menu, grp:alt_space_toggle";
-  libinput.enable = true;
-  exportConfiguration = true; # link /usr/share/X11/ properly
-  desktopManager = {
-    session = [
-      # Let the session be generated by home-manager
-      { name = "home-manager";
-        start = ''
-          ${pkgs.runtimeShell} $HOME/.hm-xsession &
-          waitPID=$!
-        '';
-        bgSupport = true;
-      }
-    ];
+  services.xserver = {
+    enable = true;
+    layout = "fr,us(altgr-intl)";
+    xkbOptions = "eurosign:e, compose:menu, grp:alt_space_toggle";
+    libinput.enable = true;
+    exportConfiguration = true; # link /usr/share/X11/ properly
+    desktopManager = {
+      session = [
+        # Let the session be generated by home-manager
+        {
+          name = "home-manager";
+          start = ''
+            ${pkgs.runtimeShell} $HOME/.hm-xsession &
+            waitPID=$!
+          '';
+          bgSupport = true;
+        }
+      ];
+    };
   };
-  displayManager = {
+  services.displayManager = {
     defaultSession = "home-manager";
     #defaultSession = "none+xmonad";
     startx.enable = true;
@@ -31,20 +33,19 @@ services.xserver = {
       user = users.julm.name;
     };
   };
-};
-environment.systemPackages = [
-  pkgs.arandr
-];
-console.useXkbConfig = true;
-sound.enable = true;
-hardware.pulseaudio.enable = true;
-/*
-services.x2goserver = {
-  enable = true;
-};
-environment.sessionVariables = {
-  PATH = [ "/usr/local/bin" ];
-};
-services.xserver.displayManager.xserverArgs = [ "+iglx" ];
-*/
+  environment.systemPackages = [
+    pkgs.arandr
+  ];
+  console.useXkbConfig = true;
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+  /*
+    services.x2goserver = {
+    enable = true;
+    };
+    environment.sessionVariables = {
+    PATH = [ "/usr/local/bin" ];
+    };
+    services.xserver.displayManager.xserverArgs = [ "+iglx" ];
+  */
 }