diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix
index 74a1f9a9..8eb5f818 100644
--- a/nixos/boxes/foryog/default.nix
+++ b/nixos/boxes/foryog/default.nix
@@ -10,8 +10,9 @@
     ../../gui
     ../../libvirt.nix
     ../../mercurial
-    ../../vim
     ../../sdr.nix
+    ../../vim
+    ../../zsh
   ];
 
   fileSystems."/" = { options = [ "compress=zstd" ]; };
diff --git a/nixos/boxes/thinky/default.nix b/nixos/boxes/thinky/default.nix
index e68f1415..2e2f0f15 100644
--- a/nixos/boxes/thinky/default.nix
+++ b/nixos/boxes/thinky/default.nix
@@ -1,20 +1,17 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{ config, pkgs, ... }: {
   networking.hostName = "thinky";
 
   imports = [
     ./hardware-configuration.nix
     ../../backups.nix
     ../../boot.nix
-    ../../distributed-builds.nix
     ../../gfx-intel.nix
     ../../git
     ../../gui
     ../../i3
     ../../mercurial
+    ../../vim
+    ../../zsh
   ];
 
   time.timeZone = "Europe/Warsaw";
@@ -27,7 +24,7 @@
     algorithm = "zstd";
     memoryPercent = 50;
   };
-  home-manager.users.cyryl = {...}: {
-    imports = [../../home-manager/programs/termite.nix];
+  home-manager.users.cyryl = { ... }: {
+    imports = [ ../../home-manager/programs/termite.nix ];
   };
 }
diff --git a/nixos/home-manager/default.nix b/nixos/home-manager/default.nix
index 2ee6be5b..e172a6da 100644
--- a/nixos/home-manager/default.nix
+++ b/nixos/home-manager/default.nix
@@ -13,7 +13,7 @@ in {
 
   home.username = username;
   home.homeDirectory = lib.mkDefault "/home/${username}";
-  home.stateVersion = "22.11";
+  home.stateVersion = "23.05";
   programs.home-manager.enable = true;
 
   imports = [
@@ -26,6 +26,5 @@ in {
     ./programs/newsboat.nix
     ./programs/ssh.nix
     ./programs/tmux.nix
-    ./programs/zsh.nix
   ];
 }
diff --git a/nixos/zsh/default.nix b/nixos/zsh/default.nix
new file mode 100644
index 00000000..e0d69452
--- /dev/null
+++ b/nixos/zsh/default.nix
@@ -0,0 +1,4 @@
+{ config, pkgs, lib, ... }: {
+  programs.zsh.enable = true;
+  home-manager.users.cyryl = { ... }: { imports = [ ./home.nix ]; };
+}
diff --git a/nixos/home-manager/programs/zsh.nix b/nixos/zsh/home.nix
similarity index 100%
rename from nixos/home-manager/programs/zsh.nix
rename to nixos/zsh/home.nix