Doctoring things up

desktop/base.nix

@@ -31,10 +31,6 @@
 		kdePackages.kwallet
 		kdePackages.kwalletmanager
 		papirus-icon-theme
-
-		# Common utils
-		thunar
-		thunar-volman
 	];
 
 	hardware.steam-hardware.enable = true;

desktop/hyprland.nix

@@ -8,6 +8,7 @@
 		./base.nix
 		./flatpak.nix
 		./fonts.nix
+		./packages.nix
 		./sddm.nix
 	];
 	services.displayManager.defaultSession = "hyprland";

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
+	];
+}

nop.sh

@@ -0,0 +1,2 @@
+#! /bin/sh
+exec nixos-option -F . "$@"