diff --git a/extras/dev.nix b/extras/dev.nix
index 3475f46..2086c45 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -1,5 +1,6 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
+    asm-lsp
     gh
     # bash-language-server
     qemu
diff --git a/users/tao.nix b/users/tao.nix
index 44498ac..522982b 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -6,7 +6,7 @@
   ...
 }: {
   users.users.tao.packages = with pkgs; [
-    davinci-resolve
+    # davinci-resolve
     nufmt
     freerdp
     nixos-anywhere
diff --git a/users/tao/helix.nix b/users/tao/helix.nix
index 1582a67..f64a96a 100644
--- a/users/tao/helix.nix
+++ b/users/tao/helix.nix
@@ -7,6 +7,7 @@
     settings = {
       theme = "gruvbox_dark_hard";
       editor = {
+        shell = ["nu" "--stdin" "-c"];
         # rainbow-brackets = true;
         line-number = "relative";
         cursorline = true;
@@ -52,7 +53,7 @@
       };
     };
     languages = {
-      use-grammars.only = ["rust" "c" "cpp" "typst" "nix" "html" "toml" "markdown" "just" "bash"];
+      use-grammars.only = ["rust" "c" "cpp" "typst" "nix" "html" "toml" "markdown" "just" "bash" "gas"];
       language = [
         {
           name = "arduino";
@@ -129,14 +130,14 @@
             unit = "\t";
           };
         }
-        {
-          name = "java";
-          auto-format = true;
-          indent = {
-            tab-width = 4;
-            unit = "\t";
-          };
-        }
+        # {
+        #   name = "java";
+        #   auto-format = true;
+        #   indent = {
+        #     tab-width = 4;
+        #     unit = "\t";
+        #   };
+        # }
         {
           name = "javascript";
           auto-format = true;
@@ -169,10 +170,13 @@
         };
       };
       language-server = {
-        jdtls = {
-          command = "jdtls";
-          args = ["-data" "/home/tao/.cache/jdtls/workspace"];
-        };
+        # gas = {
+        #   command = "asm-lsp";
+        # };
+        # jdtls = {
+        #   command = "jdtls";
+        #   args = ["-data" "/home/tao/.cache/jdtls/workspace"];
+        # };
         arduino-language-server = {
           command = "boxxy";
           args = ["arduino-language-server" "-cli" "arduino-cli" "-cli-config" "~/.local/share/arduino/cli/arduino-cli.yaml" "-jobs" "0"];