Commit 04dd7a72381b

Vincent Demeester <vincent@sbr.pm>
2018-04-30 16:09:39
Move xsession related work to home-manager
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent cb0ee53
Changed files (2)
envs/wakasu.nix
@@ -2,6 +2,19 @@
 
 {
   imports = [ ./ssh.nix ./dev.nix ];
+  home.keyboard = {
+    layout = "fr(bepo),fr";
+    variant = "oss";
+    options = ["grp:menu_toggle" "grp_led:caps" "compose:caps"];
+  };
+  xsession = {
+    enable = true;
+    windowManager.command = "i3";
+    initExtra = ''
+      ${pkgs.networkmanagerapplet}/bin/nm-applet &
+      ${pkgs.xlibs.xmodmap}/bin/xmodmap ~/.Xmodmap &
+    '';
+  };
   programs.autorandr = {
     enable = true;
   };
@@ -33,6 +46,7 @@
     spotify
     zoom-us
     youtube-dl
+    i3
     i3lock-color
   ];
   nixpkgs.config = {
profiles/desktop.nix
@@ -103,23 +103,12 @@
     #Option "Ignore" "true"
     #					''
 	];
-			windowManager = {
-				i3 = {
-					enable = true;
-				};
-				default = "i3";
-			};
-			displayManager = {
+      displayManager = {
 				slim = {
 					enable = true;
 					# Probably put this into users instead ?
 					defaultUser = "vincent";
 				};
-				sessionCommands = ''
-          ${pkgs.networkmanagerapplet}/bin/nm-applet &
-          ${pkgs.xlibs.xmodmap}/bin/xmodmap ~/.Xmodmap &
-          ${pkgs.xss-lock}/bin/xss-lock --ignore-sleep i3lock-color -- --clock -i $HOME/.background-lock --tiling &
-				'';
 			};
 		};
 	};