diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index 7131e163..938aaf63 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -7,13 +7,13 @@
     ./hardware-configuration.nix
     ../../boot.nix
     ../../common.nix
-    ../../gfx-nvidia-optimus.nix
+    ../../gfx-intel.nix
     ../../zerotier.nix
     ../../distributed-builds.nix
     ../../libvirt.nix
     ../../backups.nix
     ../../gui
-    ../../gnome
+    ../../sway
     ../../git
   ];
 
diff --git a/nixos/sway/default.nix b/nixos/sway/default.nix
new file mode 100644
index 00000000..1cfa271f
--- /dev/null
+++ b/nixos/sway/default.nix
@@ -0,0 +1,39 @@
+{ config, pkgs, ... }:
+let
+  mod = "Mod4";
+in
+  {
+    services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
+    services.dbus.socketActivated = true;
+    programs.sway.enable = true;
+    systemd.defaultUnit = "graphical.target";
+    home-manager.users.cyryl = {...}: {
+      programs.mako.enable = true;
+
+      imports = [
+      ];
+
+      home.sessionVariables = {
+      };
+
+
+      wayland.windowManager.sway = {
+        enable = true;
+        wrapperFeatures.base = true;
+        wrapperFeatures.gtk = true;
+
+        config = {
+          modifier = "${mod}";
+          keybindings = {
+            "${mod}+1" = "workspace number 1";
+            "${mod}+2" = "workspace number 2";
+            "${mod}+3" = "workspace number 3";
+            "${mod}+4" = "workspace number 4";
+
+            "${mod}+Return" = "exec ${pkgs.alacritty}/bin/alacritty";
+          };
+        };
+      };
+    };
+  }
+
diff --git a/nixos/sway/home.nix b/nixos/sway/home.nix
deleted file mode 100644
index bae5b9ba..00000000
--- a/nixos/sway/home.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, pkgs, ... }:
-{
-
-  programs.mako.enable = true;
-
-  imports = [
-  ];
-
-  home.sessionVariables = {
-  };
-
-  wayland.windowManager.sway.enable = true;
-  wayland.windowManager.sway.wrapperFeatures.base = true;
-  wayland.windowManager.sway.wrapperFeatures.gtk = true;
-
-
-  services = {
-    kdeconnect = {
-      enable = true;
-      indicator = true;
-    };
-    network-manager-applet.enable = true;
-    pasystray.enable = true;
-  };
-
-  services.udiskie.enable = true;
-
-}
diff --git a/nixos/sway/system.nix b/nixos/sway/system.nix
deleted file mode 100644
index 28f8433d..00000000
--- a/nixos/sway/system.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-{
-  services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
-  services.dbus.socketActivated = true;
-  programs.sway.enable = true;
-  systemd.defaultUnit = "graphical.target";
-}
-