diff --git a/desktop/base.nix b/desktop/base.nix
index c5213ab..0021a4b 100644
--- a/desktop/base.nix
+++ b/desktop/base.nix
@@ -31,10 +31,6 @@
 		kdePackages.kwallet
 		kdePackages.kwalletmanager
 		papirus-icon-theme
-
-		# Common utils
-		thunar
-		thunar-volman
 	];
 
 	hardware.steam-hardware.enable = true;
diff --git a/desktop/hyprland.nix b/desktop/hyprland.nix
index 3c4d5c7..a70f442 100644
--- a/desktop/hyprland.nix
+++ b/desktop/hyprland.nix
@@ -8,6 +8,7 @@
 		./base.nix
 		./flatpak.nix
 		./fonts.nix
+		./packages.nix
 		./sddm.nix
 	];
 	services.displayManager.defaultSession = "hyprland";
diff --git a/desktop/packages.nix b/desktop/packages.nix
new file mode 100644
index 0000000..7f20437
--- /dev/null
+++ b/desktop/packages.nix
@@ -0,0 +1,24 @@
+#
+# Basic desktop stuff
+#
+{ config, lib, pkgs, ... }:
+
+{
+	# Hardware
+	hardware.steam-hardware.enable = true;
+
+	# Basic system utilities
+	programs.thunar.enable = true;
+	programs.thunar.plugins = with pkgs; [
+		thunar-volman
+	];
+
+	# Common utilities
+	programs.thunderbird.enable = true;
+
+	environment.systemPackages = with pkgs; [
+		keepassxc
+		element-desktop
+		nextcloud-client
+	];
+}
diff --git a/nop.sh b/nop.sh
new file mode 100755
index 0000000..ec69a76
--- /dev/null
+++ b/nop.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec nixos-option -F . "$@"