diff --git a/common/default.nix b/common/default.nix
index 31657ff..1f4547d 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -5,5 +5,6 @@
     ./nginx.nix
     ./openssh.nix
     ./security.nix
+    ./zsh.nix
   ];
 }
\ No newline at end of file
diff --git a/common/users/qenya.nix b/common/users/qenya.nix
index 74062f7..5974069 100644
--- a/common/users/qenya.nix
+++ b/common/users/qenya.nix
@@ -11,6 +11,7 @@ in
       "networkmanager" # UI wifi configuration
       "dialout" # access to serial ports
     ];
+    shell = pkgs.zsh;
     openssh.authorizedKeys.keys = keys.users.qenya;
     uid = 1001;
   };
diff --git a/common/zsh.nix b/common/zsh.nix
new file mode 100644
index 0000000..09576b4
--- /dev/null
+++ b/common/zsh.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs,... }:
+
+{
+  programs.zsh.enable = true;
+  environment = {
+    shells = with pkgs; [ zsh ];
+    pathsToLink = [ "/share/zsh" ];
+  };
+}
diff --git a/home/zsh.nix b/home/zsh.nix
new file mode 100644
index 0000000..a970ace
--- /dev/null
+++ b/home/zsh.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    dotDir = ".config/zsh";
+
+    shellAliases = {
+      ll = "ls -l";
+    };
+
+    history = {
+      size = 10000;
+      path = "${config.xdg.dataHome}/zsh/history";
+      ignorePatterns = [ "rm *" "pkill *" ];
+    };
+
+    oh-my-zsh = {
+      enable = true;
+      plugins = [ "git" "sudo" ];
+      theme = "agnoster";
+    };
+
+    envExtra = ''
+      DEFAULT_USER=qenya
+    '';
+  };
+}
diff --git a/hosts/orm/home.nix b/hosts/orm/home.nix
index 06f12fb..e5267c7 100644
--- a/hosts/orm/home.nix
+++ b/hosts/orm/home.nix
@@ -5,6 +5,7 @@
     imports = [
       ../../home/cli.nix
       ../../home/git.nix
+      ../../home/zsh.nix
     ];
 
     home.stateVersion = "23.11";
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index b70a202..023f444 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -8,6 +8,7 @@
       ../../home/git.nix
       ../../home/gnome
       ../../home/vscode.nix
+      ../../home/zsh.nix
     ];
 
     home.packages = (with pkgs; [
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index 4df7229..d06c5cf 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -30,6 +30,11 @@
         enableACME = true;
         locations."/".return = "301 https://git.qenya.tel$request_uri";
       };
+      "birdsong.network" = {
+        forceSSL = true;
+        enableACME = true;
+        locations."/".return = "301 https://git.qenya.tel/qenya/birdsong/";
+      };
     };
   };
 
diff --git a/hosts/yevaud/home.nix b/hosts/yevaud/home.nix
index 87d8898..e8a18e9 100644
--- a/hosts/yevaud/home.nix
+++ b/hosts/yevaud/home.nix
@@ -6,6 +6,7 @@
       ../../home/cli.nix
       ../../home/git.nix
       ../../home/tmux.nix
+      ../../home/zsh.nix
     ];
 
     home.stateVersion = "23.11";