diff --git a/hosts/micronix/users.nix b/hosts/micronix/users.nix
index 07ae92f..bb1c000 100644
--- a/hosts/micronix/users.nix
+++ b/hosts/micronix/users.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   alqueva.users.xmm = {
     packages = builtins.attrValues {
       inherit
@@ -41,6 +45,8 @@
         tree-sitter
         tsc
         tree-sitter-langs
+        yasnippet
+        yasnippet-snippets
         ;
     };
     groups = [
@@ -59,8 +65,9 @@
     defaultEditor = true;
     startWithGraphical = true;
   };
-  users.defaultUserShell = pkgs.zsh;
-  environment.shells = with pkgs; [zsh];
+
+  users.users.xmm.shell = lib.mkForce pkgs.zsh;
+  users.users.xmm.useDefaultShell = lib.mkForce true;
 
   programs.zsh = {
     enable = true;