hosts/Dimaga/default.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, pkgs, ... }:
 
 let
   # Do not change this value! This tracks when NixOS was installed on your system.
@@ -48,13 +43,10 @@ in
     hibernate.enable = false;
     hybrid-sleep.enable = false;
   };
-  services = {
-    xserver.displayManager.gdm.autoSuspend = lib.mkIf config.aux.system.ui.desktops.gnome.enable false;
-    logind = {
+  services.logind = {
     lidSwitch = "lock";
     lidSwitchDocked = "lock";
   };
-  };
   services.upower.ignoreLid = true;
 
   # Enable support for building ARM64 packages
@@ -91,6 +83,8 @@ in
     # https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree
     allowUnfree = true;
 
+    apps.tmux.enable = true;
+
     # Enable Secure Boot support.
     bootloader = {
       enable = true;

hosts/Pihole/default.nix

@@ -15,6 +15,7 @@ in
   networking.hostName = hostName;
 
   aux.system = {
+    apps.tmux.enable = true;
     bootloader.enable = false; # Bootloader configured in hardware-configuration.nix
     packages = with pkgs; [
       libraspberrypi

modules/apps/tmux.nix

@@ -0,0 +1,21 @@
+{ config, lib, ... }:
+
+let
+  cfg = config.aux.system.apps.tmux;
+in
+{
+  options = {
+    aux.system.apps.tmux.enable = lib.mkEnableOption "Enables tmux - terminal multiplexer";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.tmux = {
+      enable = true;
+      newSession = true;
+      clock24 = true;
+      extraConfig = ''
+        set -g terminal-overrides 'xterm*:smcup@:rmcup@'
+      '';
+    };
+  };
+}

modules/common.nix

@@ -16,7 +16,6 @@
       packages = with pkgs; [
         fastfetch # Show a neat system statistics screen when opening a terminal
         nh # Nix Helper: https://github.com/viperML/nh
-        zellij # Terminal multiplexer
       ];
     };