i3: separate configuration for xserver and i3

Let's first configure the xserver in the desktop module, then we can
have a configuration for i3 in the home-manager.

1 files changed, 4 insertions, 20 deletions

diff --git a/users/fcuny/i3.nix b/users/fcuny/i3.nix
index 3e1a626..74fefb2 100644
--- a/users/fcuny/i3.nix
+++ b/users/fcuny/i3.nix
@@ -1,24 +1,11 @@
 { config, pkgs, lib, ... }:
 
 {
-  services.xserver = {
-    enable = true;
-    layout = "us";
-    xkbOptions = "eurosign:e";
-    libinput.enable = true;
-
-    desktopManager = {
-      xterm.enable = false;
-    };
-
-    displayManager = {
-      lightdm.enable = true;
-    };
+  xsession.enable = true;
 
-    windowManager = {
-      i3.enable = true;
-    };
-  };
+  xsession.windowManager.i3 = {
+    enable = true;
+  }
 
   programs.rofi = {
     enable = true;
@@ -31,7 +18,4 @@
       combi-modi = "window,drun,ssh";
     };
   };
-
-  services.gnome.gnome-keyring.enable = true;
-  services.gvfs.enable = true;
 }