diff --git a/gui.nix b/gui.nix
index 2d72e91..063c381 100644
--- a/gui.nix
+++ b/gui.nix
@@ -28,7 +28,7 @@
     fira-code
     fira-code-symbols
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     noto-fonts-emoji
     noto-fonts-extra
     (nerdfonts.override { fonts = [ "FiraCode" ]; })
diff --git a/noah-home.nix b/noah-home.nix
index cc8adee..005dbc8 100644
--- a/noah-home.nix
+++ b/noah-home.nix
@@ -42,6 +42,7 @@ in
     age
     just
     unstable.catgirl
+    unstable.zellij
 
     # Dev tools
     git
diff --git a/packages.nix b/packages.nix
index fee9cb4..7aaa8d2 100644
--- a/packages.nix
+++ b/packages.nix
@@ -73,7 +73,7 @@ in
     grim
     swayidle
     swaylock
-    gnome3.adwaita-icon-theme
+    adwaita-icon-theme
     dracula-theme
     glib
     xdg-utils
diff --git a/services.nix b/services.nix
index 1854cbd..7379625 100644
--- a/services.nix
+++ b/services.nix
@@ -58,22 +58,21 @@ in
   # TODO
   services.samba = {
     enable = true;
-    securityType = "user";
     openFirewall = true;
-    enableNmbd = true;
-    enableWinbindd = true;
-    extraConfig = ''
-      workgroup = WORKGROUP
-      server string = misaki
-      security = user
-      use sendfile = yes
-      hosts allow = 192.168.1. 127.0.0.1 localhost
-      hosts deny = 0.0.0.0/0
-      guest account = nobody
-      map to guest = bad user
-      deadtime = 30
-    '';
-    shares = {
+    nmbd.enable = true;
+    winbindd.enable = true;
+    settings = {
+      global = {
+        workgroup = "WORKGROUP";
+        "server string" = "misaki";
+        security = "user";
+        "use sendfile" = "yes";
+        "hosts allow" = "192.168.1. 127.0.0.1 localhost";
+        "hosts deny" = "0.0.0.0/0";
+        "guest account" = "nobody";
+        "map to guest" = "bad user";
+        deadtime = 30;
+      };
       shokuhou = {
         path = "/srv/shokuhou";
         browseable = "yes";
diff --git a/users.nix b/users.nix
index e113d93..12e9fa2 100644
--- a/users.nix
+++ b/users.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let
   home-manager = builtins.fetchTarball
-    "https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz";
+    "https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz";
 in
 {
 
@@ -29,6 +29,7 @@ in
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0jjB8VP1YoUDRRPR88DTFUWKd/fzOQ5joAWH8zn8N noah@othinus"
       "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHuQs+W/l/YDpBjd3HeWti03JXYDOLmmfiKXCd8y0g93L//fYoiJuXGMx5KNR7TZoMztGC/4yJhLRMDK2fnTu+U= noah@iphone"
       "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBFaaVbvatEya1iKcsXXifkmDNnpf9AFLKz/ifB2uPqzQfDaEmTW8vTDjDUUgMRhI3LwXi/mh5MqBqC9KLqwv4sEAAAAUaWRfZWNkc2Ffc2tAYmxpbmsuc2g= noah@bitwarden-passkey"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP+5k7mepfWkM4BE9D44uBmVtcE8KWmAKuK+JWWKs1/+ noah@purple-ipad"
     ];
   };