Add Tmux (in a smarter way)

modules/apps/social.nix

@@ -12,14 +12,8 @@ with lib;
 	config = mkIf cfg.enable {
 		nixpkgs.config.allowUnfree = true;
 		environment.systemPackages = with pkgs; [
-			# Install Beeper, but override the InstallPhase so it uses Wayland.
+			# Check Beeper Flatpak status here: https://github.com/daegalus/beeper-flatpak-wip/issues/1
-			# Check Flatpak status here: https://github.com/daegalus/beeper-flatpak-wip/issues/1
+			beeper
-			(beeper.overrideAttrs (oldAttrs: {
-				postInstall = ''
-					wrapProgram $out/bin/beeper \
-					--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=wayland --enable-features=WaylandWindowDecorations}} --no-update"
-				'';
-			}))
 		];
 
 		host.ui.flatpak.enable = true;

modules/apps/tmux.nix

@@ -0,0 +1,19 @@
+{ pkgs, config, lib, ... }:
+
+let
+	cfg = config.host.apps.tmux;
+in
+with lib;
+{
+	options = {
+		host.apps.tmux.enable = mkEnableOption (mdDoc "Enables tmux - terminal multiplexer");
+	};
+
+	config = mkIf cfg.enable {
+		programs.tmux = {
+			enable = true;
+			newSession = true;
+			clock24 = true;
+		};
+	};
+}

modules/roles/server.nix

@@ -7,10 +7,10 @@ in
 	imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
 	config = mkIf (role == "server") {
+		host.apps.tmux.enable = true;
 		environment.systemPackages = with pkgs; [
 			htop
 			mdadm
-			tmux
 		];
 	};
 }