diff --git a/lua/custom/configs/settings.lua b/lua/custom/configs/settings.lua
index c7393d9a..04944e19 100644
--- a/lua/custom/configs/settings.lua
+++ b/lua/custom/configs/settings.lua
@@ -51,3 +51,4 @@ global.mkdp_browser = '/usr/bin/firefox'
 --o.foldmethod = 'syntax'
 o.foldmethod = 'expr'
 o.foldexpr = 'nvim_treesitter#foldexpr()'
+o.foldlevel = 1
diff --git a/lua/custom/plugins/debug.lua b/lua/custom/plugins/debug.lua
index 6cdbdecd..49a2f3b7 100644
--- a/lua/custom/plugins/debug.lua
+++ b/lua/custom/plugins/debug.lua
@@ -33,7 +33,36 @@ return {
     local dap_go = require 'dap-go'
 
     -- Install golang specific config
-    dap_go.setup()
+    dap_go.setup {
+      -- Additional dap configurations can be added.
+      -- dap_configurations accepts a list of tables where each entry
+      -- represents a dap configuration. For more details do:
+      -- :help dap-configuration
+      dap_configurations = {
+        {
+          -- Must be "go" or it will be ignored by the plugin
+          type = "go",
+          name = "Attach remote",
+          mode = "remote",
+          request = "attach",
+        },
+      },
+      -- delve configurations
+      delve = {
+        -- the path to the executable dlv which will be used for debugging.
+        -- by default, this is the "dlv" executable on your PATH.
+        path = "dlv",
+        -- time to wait for delve to initialize the debug session.
+        -- default to 20 seconds
+        initialize_timeout_sec = 20,
+        -- a string that defines the port to start delve debugger.
+        -- default to string "${port}" which instructs nvim-dap
+        -- to start the process in a random available port
+        port = "${port}",
+        -- additional args to pass to dlv
+        args = {}
+      },
+    }
 
     -- Dap UI setup
     -- For more information, see |:help nvim-dap-ui|
@@ -94,6 +123,5 @@ return {
     dap.listeners.after.event_initialized['dapui_config'] = dapui.open
     dap.listeners.before.event_terminated['dapui_config'] = dapui.close
     dap.listeners.before.event_exited['dapui_config'] = dapui.close
-
   end,
 }
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
index fc75c8dd..5f453a54 100644
--- a/lua/custom/plugins/go.lua
+++ b/lua/custom/plugins/go.lua
@@ -9,7 +9,10 @@ return {
 		"nvim-treesitter/nvim-treesitter",
 	},
 	config = function()
+		-- local gofmt = require("go.format")
 		require("go").setup()
+
+		-- vim.keymap.set('n', 'gF', gofmt.goimport, { desc = 'Go Import' })
 	end,
 	event = { "CmdlineEnter" },
 	ft = { "go", 'gomod' },
diff --git a/lua/custom/plugins/rest.lua b/lua/custom/plugins/rest.lua
index 75e1e253..6b7bc16d 100644
--- a/lua/custom/plugins/rest.lua
+++ b/lua/custom/plugins/rest.lua
@@ -1,48 +1,106 @@
 return {
-	"rest-nvim/rest.nvim",
-	dependencies = { "nvim-lua/plenary.nvim" },
-	config = function()
-		local rest_client = require("rest-nvim")
+  "rest-nvim/rest.nvim",
+  -- enabled = false,
+  dependencies = { "nvim-lua/plenary.nvim" },
+  ft = "http",
+  config = function()
+    local rest_nvim = require "rest-nvim"
 
-		rest_client.setup {
-			-- Open request results in a horizontal split
-			result_split_horizontal = false,
-			-- Keep the http file buffer above|left when split horizontal|vertical
-			result_split_in_place = false,
-			-- Skip SSL verification, useful for unknown certificates
-			skip_ssl_verification = false,
-			-- Encode URL before making request
-			encode_url = true,
-			-- Highlight request on run
-			highlight = {
-				enabled = true,
-				timeout = 150,
-			},
-			result = {
-				-- toggle showing URL, HTTP info, headers at top the of result window
-				show_url = true,
-				-- show the generated curl command in case you want to launch
-				-- the same request via the terminal (can be verbose)
-				show_curl_command = false,
-				show_http_info = true,
-				show_headers = true,
-				-- executables or functions for formatting response body [optional]
-				-- set them to false if you want to disable them
-				formatters = {
-					json = "jq",
-					html = function(body)
-						return vim.fn.system({ "tidy", "-i", "-q", "-" }, body)
-					end
-				},
-			},
-			-- Jump to request line on run
-			jump_to_request = false,
-			env_file = '.env',
-			custom_dynamic_variables = {},
-			yank_dry_run = true,
-		}
+    rest_nvim.setup {
+      -- Open request results in a horizontal split
+      result_split_horizontal = false,
+      -- Skip SSL verification, useful for unknown certificates
+      skip_ssl_verification = false,
+      encode_url = false,
+      -- Highlight request on run
+      highlight = {
+        enabled = true,
+        timeout = 150,
+      },
+      result = {
+        -- toggle showing URL, HTTP info, headers at top the of result window
+        show_url = true,
+        show_http_info = true,
+        show_headers = true,
+      },
+      -- Jump to request line on run
+      jump_to_request = false,
+      env_file = ".env",
+      custom_dynamic_variables = {},
+      yank_dry_run = true,
+    }
 
-		vim.keymap.set('n', '<leader>rc', rest_client.run, { desc = '[R]un rest [Client]' })
-		vim.keymap.set('n', '<leader>rl', rest_client.last, { desc = '[R]un rest [Last] request' })
-	end
+    vim.api.nvim_create_autocmd("FileType", {
+      pattern = "http",
+      callback = function()
+        local buff = tonumber(vim.fn.expand "<abuf>", 10)
+        vim.keymap.set(
+          "n",
+          "<leader>rc",
+          rest_nvim.run,
+          { noremap = true, buffer = buff, desc = "Run near http request" }
+        )
+        vim.keymap.set(
+          "n",
+          "<leader>rl",
+          rest_nvim.last,
+          { noremap = true, buffer = buff, desc = "Run last http resquest" }
+        )
+        vim.keymap.set("n", "<leader>rp", function()
+          rest_nvim.run(true)
+        end, { noremap = true, buffer = buff, desc = "Preview http curl" })
+      end,
+    })
+  end,
 }
+-- return {
+-- 	'BlackLight/nvim-http'
+-- }
+-- return {
+-- 	"rest-nvim/rest.nvim",
+-- 	dependencies = { "nvim-lua/plenary.nvim" },
+-- 	config = function()
+-- 		local rest_client = require("rest-nvim")
+--
+-- 		rest_client.setup {
+-- 			-- Open request results in a horizontal split
+-- 			result_split_horizontal = false,
+-- 			-- Keep the http file buffer above|left when split horizontal|vertical
+-- 			result_split_in_place = false,
+-- 			-- Skip SSL verification, useful for unknown certificates
+-- 			skip_ssl_verification = false,
+-- 			-- Encode URL before making request
+-- 			encode_url = true,
+-- 			-- Highlight request on run
+-- 			highlight = {
+-- 				enabled = true,
+-- 				timeout = 150,
+-- 			},
+-- 			result = {
+-- 				-- toggle showing URL, HTTP info, headers at top the of result window
+-- 				show_url = true,
+-- 				-- show the generated curl command in case you want to launch
+-- 				-- the same request via the terminal (can be verbose)
+-- 				show_curl_command = false,
+-- 				show_http_info = true,
+-- 				show_headers = true,
+-- 				-- executables or functions for formatting response body [optional]
+-- 				-- set them to false if you want to disable them
+-- 				formatters = {
+-- 					json = "jq",
+-- 					html = function(body)
+-- 						return vim.fn.system({ "tidy", "-i", "-q", "-" }, body)
+-- 					end
+-- 				},
+-- 			},
+-- 			-- Jump to request line on run
+-- 			jump_to_request = false,
+-- 			env_file = '.env',
+-- 			custom_dynamic_variables = {},
+-- 			yank_dry_run = true,
+-- 		}
+--
+-- 		vim.keymap.set('n', '<leader>rc', rest_client.run, { desc = '[R]un rest [Client]' })
+-- 		vim.keymap.set('n', '<leader>rl', rest_client.last, { desc = '[R]un rest [Last] request' })
+-- 	end
+-- }
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index 38f500c8..969861f7 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -150,3 +150,18 @@ a893
 b1177a
 dataItem
 CountryCode
+MVVM
+MVC
+DataStore
+Proto
+Firebase
+Gradle
+Modularization
+observables
+courotines
+RxJava
+OKHttp
+Firestore
+OpenAI
+firestore
+LiveData
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
index 16749ba2..51fa8046 100644
Binary files a/spell/en.utf-8.add.spl and b/spell/en.utf-8.add.spl differ