diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
new file mode 100644
index 00000000..a2db20e0
--- /dev/null
+++ b/after/ftplugin/javascript.vim
@@ -0,0 +1,7 @@
+setlocal tabstop=2
+setlocal shiftwidth=2
+setlocal expandtab
+setlocal softtabstop=2
+setlocal autoindent
+setlocal smartindent
+setlocal cindent
diff --git a/after/ftplugin/typescript.vim b/after/ftplugin/typescript.vim
new file mode 100644
index 00000000..a2db20e0
--- /dev/null
+++ b/after/ftplugin/typescript.vim
@@ -0,0 +1,7 @@
+setlocal tabstop=2
+setlocal shiftwidth=2
+setlocal expandtab
+setlocal softtabstop=2
+setlocal autoindent
+setlocal smartindent
+setlocal cindent
diff --git a/init.lua b/init.lua
index 5e181c41..1088eb14 100644
--- a/init.lua
+++ b/init.lua
@@ -155,7 +155,7 @@ vim.opt.inccommand = 'split'
 vim.opt.cursorline = true
 
 -- Minimal number of screen lines to keep above and below the cursor.
-vim.opt.scrolloff = 20
+vim.opt.scrolloff = 10
 
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`
@@ -253,6 +253,9 @@ vim.opt.laststatus = 2
 -- Remove the mode display since it's in the statusline
 vim.opt.showmode = false
 
+-- Open the terminal with <leader> t
+-- vim.keymap.set('n', '<leader>[', '<cmd>terminal<CR>', { desc = 'Open [T]erminal' })
+
 -- Optional: customize colors based on your colorscheme
 -- Replace these colors with ones that match your theme
 vim.cmd [[
@@ -809,6 +812,25 @@ require('lazy').setup({
     end,
   },
 
+  {
+    'rhysd/conflict-marker.vim',
+    event = 'VimEnter',
+  },
+
+  {
+    'wfxr/minimap.vim',
+    event = 'VimEnter',
+    config = function()
+      vim.g.minimap_auto_start = 1
+      vim.g.minimap_auto_start_win_enter = 1
+      vim.g.minimap_width = 10
+      vim.g.minimap_highlight_range = 1
+      vim.g.minimap_highlight_search = 1
+      vim.g.minimap_auto_start = 1
+      vim.g.minimap_auto_start_win_enter = 1
+    end,
+  },
+
   {
     'ThePrimeagen/refactoring.nvim',
     dependencies = {
@@ -1084,6 +1106,31 @@ require('lazy').setup({
     --    - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
     --    - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
   },
+  {
+    'mrcjkb/rustaceanvim',
+    version = '^5', -- Recommended
+    lazy = false, -- This plugin is already lazy
+  },
+
+  {
+    'voldikss/vim-floaterm',
+    keys = {
+      {
+        '<leader>tt',
+        function()
+          vim.cmd 'FloatermToggle'
+        end,
+        mode = 'n',
+        desc = '[T]oggle [T]erminal',
+      },
+    },
+  },
+
+  {
+    'windwp/nvim-autopairs',
+    event = 'InsertEnter',
+    config = true,
+  },
 
   -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
   -- init.lua. If you want these files, they are in the repository, so you can just download them and