diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index 475bb73..39d6046 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -24,16 +24,8 @@
   services.gvfs.enable = true;
 
 
-
-  time.timeZone = "Europe/Warsaw";
-  i18n.defaultLocale = "pl_PL.UTF-8";
   services.xserver.xkb.layout = "pl";
-  console = {
-    enable = true;
-    earlySetup = true;
-    font = "${pkgs.kbd}/share/consolefonts/lat2-16.psfu.gz";
-    keyMap = "pl";
-  };
+
 
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "amdgpu" ];
diff --git a/configurations/profile/os/default.nix b/configurations/profile/os/default.nix
index 323eea6..4209792 100644
--- a/configurations/profile/os/default.nix
+++ b/configurations/profile/os/default.nix
@@ -1,13 +1,29 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   imports = [
     ./nix.nix
     ./fonts.nix
-    
+
     ./shell
     ./games
     ./desktop
   ];
-  
+
+  time.timeZone = lib.mkDefault "Europe/Warsaw";
+  i18n.defaultLocale = lib.mkDefault "pl_PL.UTF-8";
+
+  console = {
+    enable = lib.mkDefault true;
+    earlySetup = lib.mkDefault true;
+    font = lib.mkDefault "LatArCyrHeb-16";
+    keyMap = lib.mkDefault "pl";
+  };
+
+  programs.tmux = {
+    enable = lib.mkDefault true;
+    clock24 = lib.mkDefault true;
+  };
+  environment.systemPackages = lib.mkIf config.programs.tmux.enable [ pkgs.tmux.terminfo ];
+
 }
  
\ No newline at end of file
diff --git a/configurations/profile/os/shell/zsh.nix b/configurations/profile/os/shell/zsh.nix
index 5d5ecb2..f6d9739 100644
--- a/configurations/profile/os/shell/zsh.nix
+++ b/configurations/profile/os/shell/zsh.nix
@@ -11,9 +11,11 @@ in
       enable = true;
       enableGlobalCompInit=false;
       interactiveShellInit = ''
-        if [[ $(${pkgs.coreutils}/bin/echo $TTY | ${pkgs.gnugrep}/bin/grep "/dev/tty") ]] && [[ "$TERM" == "linux"  ]]; then
-           setfont lat2-16 -m 8859-2
-        fi
+       ${ lib.optionalString (config.console.font != null)
+        ''if [[ $(${pkgs.coreutils}/bin/echo $TTY | ${pkgs.gnugrep}/bin/grep "/dev/tty") ]] && [[ "$TERM" == "linux"  ]]; then
+           setfont ${config.console.font}
+        fi''
+       }
 
         if [[ ''${__MATERUS_HM_ZSH:-0} == 0 ]]; then
           source ${pkgs.grml-zsh-config}/etc/zsh/zshrc