diff --git a/home/windowManager/i3.nix b/home/windowManager/i3.nix
index 4bc8e6b..df15a3e 100644
--- a/home/windowManager/i3.nix
+++ b/home/windowManager/i3.nix
@@ -168,47 +168,11 @@ in {
     };
 
     startup = [
-      # TODO: Move configuration to configuration instead of calls from i3
-      {
-        # Increase mouse speed
-        command = "xinput --set-prop 13 'libinput Accel Speed' 1";
-        notification = false;
-      }
-      {
-        # Use natural scrolling for trackpad
-        command = "xinput --set-prop 'DELL07E6:00 06CB:76AF Touchpad' 'libinput Natural Scrolling Enabled' 1";
-        notification = false;
-      }
-      {
-        command = "xinput --set-prop 'DELL07E6:00 06CB:76AF Touchpad' 'libinput Tapping Enabled' 1";
-        notification = false;
-      }
-      {
-        command = "xsetroot -solid \"#2E3436\"";
-        notification = false;
-      }
-      {
-        command = "xset s off";
-        notification = false;
-      }
-
-      # Configure display
-      {
-        command = "xrandr --output eDP1 --scale 0.75x0.75 --mode 2560x1440 --brightness 1";
-      }
-      {
-        command = "xbacklight -set 25";
-      }
-
       # Start programs / applets
       {
         command = "clipit";
         notification = false;
       }
-      {
-        command = "eval $(ssh-agent)";
-        notification = false;
-      }
       {
         command = "nm-applet";
         notification = false;
diff --git a/home/xsession.nix b/home/xsession.nix
index d409719..fe6b404 100644
--- a/home/xsession.nix
+++ b/home/xsession.nix
@@ -5,6 +5,23 @@
 
   numlock.enable = true;
 
+  # TODO: Check how to set those options somewhere else?
+  initExtra = ''
+    eval $(ssh-agent)
+
+    xrandr --auto --brightness 1
+
+    xbacklight -set 25
+    xsetroot -solid "#2E3436"
+    xset s off
+
+    xinput --set-prop 'DELL07E6:00 06CB:76AF Touchpad' 'libinput Tapping Enabled' 1
+    # Use natural scrolling for trackpad
+    xinput --set-prop 'DELL07E6:00 06CB:76AF Touchpad' 'libinput Natural Scrolling Enabled' 1
+    # Increase mouse speed
+    xinput --set-prop 13 'libinput Accel Speed' 1
+  '';
+
   windowManager.i3 = import ./windowManager/i3.nix {
     inherit config pkgs;
   };