diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix
index 21e15b64..a3d940e5 100644
--- a/nixos/boxes/foureighty/default.nix
+++ b/nixos/boxes/foureighty/default.nix
@@ -12,6 +12,7 @@
     ../../distributed-builds.nix
     ../../libvirt.nix
     ../../backups.nix
+    ../../gui
     ../../gnome
   ];
 
@@ -39,7 +40,6 @@
   home-manager.users.cyryl = {...}: {
     imports = [
       ../../home-manager
-      ../../home-manager/gui.nix
       ../../home-manager/programs/git.nix
     ];
     home.stateVersion = config.system.stateVersion;
diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
new file mode 100644
index 00000000..d726ede5
--- /dev/null
+++ b/nixos/gui/default.nix
@@ -0,0 +1,40 @@
+{ config, pkgs, ... }:
+
+{
+  home-manager.users.cyryl = {...}: {
+    gtk = {
+      enable = true;
+      iconTheme = {
+        name = "Adwaita";
+        package = pkgs.gnome3.adwaita-icon-theme;
+      };
+    };
+    qt = {
+      enable = true;
+      platformTheme = "gnome";
+    };
+
+    imports = [
+      ./vscode.nix
+    ];
+
+    home.packages = with pkgs; [
+      zoom-us
+      passff-host
+      gnome3.gnome-screenshot gsettings-desktop-schemas
+      apvlv xidlehook
+      fontconfig xclip gimp glxinfo
+      mindforger
+      evince signal-desktop
+      vlc
+      jetbrains.goland jetbrains.clion jetbrains.idea-ultimate android-studio
+      yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt
+      slack discord gnome3.nautilus gnome3.eog
+      hopper
+      qemu aqemu
+      spotify shotwell
+      gnome-builder flatpak-builder flatpak python38Packages.lxml python38Packages.jedi meson
+      firefox-wayland libreoffice
+    ];
+  };
+}
diff --git a/nixos/home-manager/vscode.nix b/nixos/gui/vscode.nix
similarity index 100%
rename from nixos/home-manager/vscode.nix
rename to nixos/gui/vscode.nix
diff --git a/nixos/home-manager/gui.nix b/nixos/home-manager/gui.nix
deleted file mode 100644
index eab67ede..00000000
--- a/nixos/home-manager/gui.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  gtk = {
-    enable = true;
-    iconTheme = {
-      name = "Adwaita";
-      package = pkgs.gnome3.adwaita-icon-theme;
-    };
-  };
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-  };
-
-  imports = [
-    ./vscode.nix
-  ];
-
-  home.packages = with pkgs; [
-    zoom-us
-    passff-host
-    gnome3.gnome-screenshot gsettings-desktop-schemas
-    apvlv xidlehook
-    fontconfig xclip gimp glxinfo
-    mindforger
-    evince signal-desktop
-    vlc
-    jetbrains.goland jetbrains.clion jetbrains.idea-ultimate android-studio
-    yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt
-    slack discord gnome3.nautilus gnome3.eog
-    hopper
-    qemu aqemu
-    spotify shotwell
-    gnome-builder flatpak-builder flatpak python38Packages.lxml python38Packages.jedi meson
-    firefox-wayland libreoffice
-  ];
-}