diff --git a/lua/community.lua b/lua/community.lua
index 8f7bed0..5ff70b6 100644
--- a/lua/community.lua
+++ b/lua/community.lua
@@ -9,7 +9,7 @@ return {
   { import = "astrocommunity.pack.cpp" },
   { import = "astrocommunity.pack.astro" },
   { import = "astrocommunity.pack.svelte" },
-  { import = "astrocommunity.pack.rust" },
+  -- { import = "astrocommunity.pack.rust" },
   { import = "astrocommunity.pack.tailwindcss" },
   { import = "astrocommunity.pack.toml" },
   { import = "astrocommunity.pack.yaml" },
@@ -24,7 +24,7 @@ return {
   { import = "astrocommunity.scrolling.satellite-nvim" },
   { import = "astrocommunity.scrolling.vim-smoothie" },
   { import = "astrocommunity.media.presence-nvim" },
-  { import = "astrocommunity.workflow.hardtime-nvim" },
+  -- { import = "astrocommunity.workflow.hardtime-nvim" },
   { import = "astrocommunity.colorscheme.nightfox-nvim" },
   -- import/override with your plugins folder
 }
diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua
index 7a15748..f8d72b6 100644
--- a/lua/plugins/astrocore.lua
+++ b/lua/plugins/astrocore.lua
@@ -8,7 +8,6 @@ return {
     -- vim.lsp.inlay_hint.enable(0, true),
   },
 }
--- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 --
 -- -- AstroCore provides a central place to modify mappings, vim options, autocommands, and more!
 -- -- Configuration documentation can be found with `:h astrocore`
diff --git a/lua/plugins/astrolsp.lua b/lua/plugins/astrolsp.lua
index 08cc97e..4f31121 100644
--- a/lua/plugins/astrolsp.lua
+++ b/lua/plugins/astrolsp.lua
@@ -56,6 +56,7 @@ return {
     },
     -- Configure buffer local auto commands to add when attaching a language server
     autocmds = {
+      eslint_fix_on_save = false,
       -- first key is the `augroup` to add the auto commands to (:h augroup)
       lsp_document_highlight = {
         -- Optional condition to create/delete auto command group
diff --git a/lua/plugins/crates.lua.old b/lua/plugins/crates.lua
similarity index 100%
rename from lua/plugins/crates.lua.old
rename to lua/plugins/crates.lua
diff --git a/lua/plugins/hardtime.lua b/lua/plugins/hardtime.lua
new file mode 100644
index 0000000..0c8e024
--- /dev/null
+++ b/lua/plugins/hardtime.lua
@@ -0,0 +1,19 @@
+return {
+  "m4xshen/hardtime.nvim",
+  event = "User AstroFile",
+  opts = {
+    disable_mouse = false,
+    restriction_mode = "hint",
+    disabled_keys = {
+      ["<Insert>"] = { "", "i" },
+      ["<Home>"] = { "", "i" },
+      ["<End>"] = { "", "i" },
+      ["<PageUp>"] = { "", "i" },
+      ["<PageDown>"] = { "", "i" },
+    },
+  },
+  config = function(_, opts)
+    require("hardtime").setup(opts)
+    require("hardtime").enable()
+  end,
+}
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
index 842459a..0e9e391 100644
--- a/lua/plugins/mason.lua
+++ b/lua/plugins/mason.lua
@@ -10,7 +10,9 @@ return {
       -- add more things to the ensure_installed table protecting against community packs modifying it
       opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
         "lua_ls",
-        -- "rust_analyzer",
+        -- "astro",
+        -- "svelte",
+        "rust_analyzer",
         -- add more arguments for adding more language servers
       })
     end,
@@ -43,7 +45,10 @@ return {
     "WhoIsSethDaniel/mason-tool-installer.nvim",
     optional = true,
     opts = function(_, opts)
-      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, { "codelldb" })
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, {
+        "codelldb",
+        -- "astro-language-server",
+      })
     end,
   },
 }
diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua
index 40649e7..f428f15 100644
--- a/lua/plugins/none-ls.lua
+++ b/lua/plugins/none-ls.lua
@@ -8,7 +8,7 @@ return {
   "nvimtools/none-ls.nvim",
   opts = function(_, config)
     -- config variable is the default configuration table for the setup function call
-    -- local null_ls = require "null-ls"
+    local null_ls = require "null-ls"
 
     -- Check supported formatters and linters
     -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/formatting
@@ -16,7 +16,12 @@ return {
     config.sources = {
       -- Set a formatter
       -- null_ls.builtins.formatting.stylua,
-      -- null_ls.builtins.formatting.prettier,
+      null_ls.builtins.formatting.prettier.with {
+        extra_filetypes = {
+          "svelte",
+          "astro",
+        },
+      },
     }
     return config -- return final config table
   end,