diff --git a/home/Aloria.nix b/home/Aloria.nix
index 02e2a32..aa95ed3 100644
--- a/home/Aloria.nix
+++ b/home/Aloria.nix
@@ -28,6 +28,7 @@ in {
     jetbrains.pycharm
     rclone
     opencode
+    claude-code
     # zed-editor
     uv
     google-cloud-sdk
diff --git a/home/git/default.nix b/home/git/default.nix
index 401e9d8..66c3a29 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -42,8 +42,17 @@
       "*.nix/"
       "uv.lock"
       ".dmypy.json"
+      ".envrc"
     ];
   };
+  programs.delta = {
+    enable = true;
+    options = {
+      diff-so-fancy = true;
+      file-style = "omit";
+      # hunk-header-style = "omit";
+    };
+  };
 
   programs.lazygit = {
     enable = true;
@@ -52,6 +61,12 @@
         editPreset = "nvim";
         autoStageResolvedConflicts = false;
       };
+      git.pagers = [
+        {
+          colorArg = "always";
+          pager = "delta --dark --color-only --paging=never";
+        }
+      ];
     };
   };
 
diff --git a/home/helium/default.nix b/home/helium/default.nix
index bb0389a..e720802 100644
--- a/home/helium/default.nix
+++ b/home/helium/default.nix
@@ -8,6 +8,7 @@
         sha256 = "sha256-qzc135IP5F2btxtOMUGMz+0azJhYL9KI0lcPG2KjcxU=";
       };
       extraPkgs = pkgs: [pkgs.tzdata];
+      profile = "export TZ=Asia/Bangkok";
     })
   ];
   xdg.desktopEntries = {
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 67e7cd3..1da6239 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -2,9 +2,19 @@
   config,
   pkgs,
   ...
-}: {
+}: let
+  basedpyrightShim = pkgs.symlinkJoin {
+    name = "basedpyright-with-pyright-shim";
+    paths = [pkgs.basedpyright];
+    postBuild = ''
+      ln -s $out/bin/basedpyright-langserver $out/bin/pyright-langserver
+      ln -s $out/bin/basedpyright            $out/bin/pyright
+    '';
+  };
+in {
   home.packages = with pkgs; [
     # codeium
+    basedpyrightShim
     nixd
     alejandra
     clang-tools