diff --git a/flake.nix b/flake.nix
index 115542c..31b0d15 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,8 +14,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils.url = "github:numtide/flake-utils";
-    # ziggy.url = "github:kristoff-it/ziggy";
-    superhtml.url = "git+https://git.yadunut.dev/yadunut/superhtml";
   };
 
   outputs = {
diff --git a/modules/neovim.nix b/modules/neovim.nix
index 0338007..c48dfd8 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -31,10 +31,6 @@
         };
       };
 
-      none-ls = {
-        enable = true;
-        sources.formatting.ocamlformat.enable = true;
-      };
       lsp = {
         # package = pkgs.vimUtils.buildVimPlugin {
         #   name = "lsp";
@@ -50,43 +46,12 @@
           # gleam.enable = true;
           ts_ls.enable = true; # TS/JS
           biome.enable = true; # TS/JS
-
           pyright.enable = true; # Python
           ruff.enable = true; # python
-
           nil_ls.enable = true; # nix
-          rust_analyzer.enable = true;
-          rust_analyzer.installCargo = false;
-          rust_analyzer.installRustc = false;
-
           cssls.enable = true;
           jsonls.enable = true;
           html.enable = true;
-          denols.enable = false;
-          denols.autostart = false;
-          gopls.enable = true;
-
-          ziggy = {
-            enable = false;
-            package = inputs.ziggy.outputs.packages.aarch64-darwin.ziggy;
-          };
-          ziggy_schema = {
-            enable = false;
-            package = inputs.ziggy.outputs.packages.aarch64-darwin.ziggy;
-          };
-          zls= {
-            package = null;
-            enable = true;
-          };
-
-          superhtml = {
-            enable = true;
-            package = inputs.superhtml.outputs.packages.aarch64-darwin.superhtml;
-          };
-          ocamllsp = {
-            enable = true;
-            package = null;
-          };
 
         };
         keymaps.lspBuf = {
@@ -424,125 +389,5 @@
         options.desc = "Toggle Flash";
       }
     ];
-
-    extraConfigLua = ''
-      vim.api.nvim_create_autocmd('FileType', {
-        group = vim.api.nvim_create_augroup('ziggy', {}),
-        pattern = 'ziggy',
-        callback = function()
-          vim.lsp.start {
-            name = 'Ziggy LSP',
-            cmd = { 'ziggy', 'lsp' },
-            root_dir = vim.loop.cwd(),
-            flags = { exit_timeout = 1000 },
-          }
-        end,
-      })
-
-      vim.api.nvim_create_autocmd('FileType', {
-        group = vim.api.nvim_create_augroup('ziggy_schema', {}),
-        pattern = 'ziggy_schema',
-        callback = function()
-          vim.lsp.start {
-            name = 'Ziggy LSP',
-            cmd = { 'ziggy', 'lsp', '--schema' },
-            root_dir = vim.loop.cwd(),
-            flags = { exit_timeout = 1000 },
-          }
-        end,
-      })
-
-      vim.api.nvim_create_autocmd('FileType', {
-        group = vim.api.nvim_create_augroup('superhtml', {}),
-        pattern = 'superhtml',
-        callback = function()
-          vim.lsp.start {
-            name = 'SuperHTML LSP',
-            cmd = { 'superhtml', 'lsp' },
-            root_dir = vim.loop.cwd(),
-            flags = { exit_timeout = 1000 },
-          }
-        end,
-      })
-      local parser_config = require(
-        'nvim-treesitter.parsers'
-      ).get_parser_configs()
-      parser_config.ziggy = {
-        install_info = {
-          url = 'https://github.com/kristoff-it/ziggy',
-          includes = { 'tree-sitter-ziggy/src' },
-          files = { 'tree-sitter-ziggy/src/parser.c' },
-          branch = 'main',
-          generate_requires_npm = false,
-          requires_generate_from_grammar = false,
-        },
-        filetype = 'ziggy',
-      }
-
-      parser_config.ziggy_schema = {
-        install_info = {
-          url = 'https://github.com/kristoff-it/ziggy',
-          files = { 'tree-sitter-ziggy-schema/src/parser.c' },
-          branch = 'main',
-          generate_requires_npm = false,
-          requires_generate_from_grammar = false,
-        },
-        filetype = 'ziggy-schema',
-      }
-
-      parser_config.supermd = {
-        install_info = {
-          url = 'https://github.com/kristoff-it/supermd',
-          includes = { 'tree-sitter/supermd/src' },
-          files = {
-            'tree-sitter/supermd/src/parser.c',
-            'tree-sitter/supermd/src/scanner.c'
-          },
-          branch = 'main',
-          generate_requires_npm = false,
-          requires_generate_from_grammar = false,
-        },
-        filetype = 'supermd',
-      }
-
-      parser_config.supermd_inline = {
-        install_info = {
-          url = 'https://github.com/kristoff-it/supermd',
-          includes = { 'tree-sitter/supermd-inline/src' },
-          files = {
-            'tree-sitter/supermd-inline/src/parser.c',
-            'tree-sitter/supermd-inline/src/scanner.c'
-          },
-          branch = 'main',
-          generate_requires_npm = false,
-          requires_generate_from_grammar = false,
-        },
-        filetype = 'supermd_inline',
-      }
-
-      parser_config.superhtml = {
-        install_info = {
-          url = 'https://github.com/kristoff-it/superhtml',
-          includes = { 'tree-sitter-superhtml/src' },
-          files = {
-            'tree-sitter-superhtml/src/parser.c',
-            'tree-sitter-superhtml/src/scanner.c'
-          },
-          branch = 'main',
-          generate_requires_npm = false,
-          requires_generate_from_grammar = false,
-        },
-        filetype = 'superhtml',
-      }
-
-      vim.filetype.add {
-        extension = {
-          smd = 'supermd',
-          shtml = 'superhtml',
-          ziggy = 'ziggy',
-          ['ziggy-schema'] = 'ziggy_schema',
-        },
-      }
-    '';
   };
 }
diff --git a/modules/zsh.nix b/modules/zsh.nix
index ffdef8c..15a8736 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -59,8 +59,11 @@
   programs.zoxide.enable = true;
   programs.zoxide.enableZshIntegration = true;
 
-  programs.eza.enable = true;
-  programs.eza.enableZshIntegration = true;
+  programs.eza = {
+    enable = true;
+    enableZshIntegration = true;
+    extraOptions = ["--group-directories-first"];
+  };
 
   programs.starship = {
     enable = true;
diff --git a/yadunut-mbp/home.nix b/yadunut-mbp/home.nix
index ef58103..bcb9c8a 100644
--- a/yadunut-mbp/home.nix
+++ b/yadunut-mbp/home.nix
@@ -48,9 +48,8 @@
     pkgs.httpie
     pkgs.emacs
     pkgs.devenv
+    pkgs.jj
 
-    # (inputs.ziggy.outputs.packages.aarch64-darwin.ziggy)
-    # (inputs.superhtml.outputs.packages.aarch64-darwin.superhtml)
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the