From 97bd4eba355d9a7f60a52607b0a94d34882d7d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 14 Jul 2019 09:35:06 +0100
Subject: [PATCH] Extract xsession

---
 nixos/home.nix          | 17 ++---------------
 nixos/user-xsession.nix | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 nixos/user-xsession.nix

diff --git a/nixos/home.nix b/nixos/home.nix
index 187c7c67..d8f0af96 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -2,7 +2,6 @@
 
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
-  mod = "Mod4";
 in
   {
     nixpkgs.config = {
@@ -30,25 +29,13 @@ in
     home.sessionVariables = {
       TERMINAL="alacritty";
     };
-    xsession = {
-      enable = true;
-      windowManager.i3 = {
-        enable = true;
-        config = {
-          modifier = mod;
-          keybindings = {
-            "${mod}+Return" = "exec i3-sensible-terminal";
-            "${mod}+Shift+q" = "kill";
-            "${mod}+d" = "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
-          };
-        };
-      };
-    };
+
     imports = [
       ./programs/tmux.nix
       ./programs/zsh.nix
       ./programs/vim.nix
       ./programs/alacritty.nix
+      ./user-xsession.nix
     ];
 
     programs = {
diff --git a/nixos/user-xsession.nix b/nixos/user-xsession.nix
new file mode 100644
index 00000000..a187140d
--- /dev/null
+++ b/nixos/user-xsession.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+let
+  mod = "Mod4";
+in
+  {
+    xsession = {
+      enable = true;
+      windowManager.i3 = {
+        enable = true;
+        config = {
+          modifier = mod;
+          keybindings = {
+            "${mod}+Return" = "exec i3-sensible-terminal";
+            "${mod}+Shift+q" = "kill";
+            "${mod}+d" = "exec ${pkgs.rofi}/bin/rofi -show combi -combi-modi window#run#ssh -modi combi";
+            "${mod}+f" = "fullscreen toggle";
+          };
+        };
+      };
+    };
+  }