diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e93c819..11f7b2e 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -36,5 +36,8 @@ conda deactivate
 
 direnv hook fish | source
 
+# opam configuration
+source /home/afonso/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
+
 starship init fish | source
 
diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua
index 330ded1..99d33e6 100644
--- a/.config/nvim/lua/plugins/lazy.lua
+++ b/.config/nvim/lua/plugins/lazy.lua
@@ -160,7 +160,7 @@ lazy.setup({
 
     {
         'luk400/vim-jukit',
-        event = "VeryLazy",
+        ft = {'python','ipynb'},
     },
 
     {
@@ -223,6 +223,40 @@ lazy.setup({
         end
     },
 
+    {
+        "rcarriga/nvim-dap-ui",
+        event = "VeryLazy",
+        dependencies = "mfussenegger/nvim-dap",
+        config = function()
+            local dap = require("dap")
+            local dapui = require("dapui")
+            dapui.setup()
+            dap.listeners.after.event_initialized["dapui_config"] = function()
+                dapui.open()
+            end
+            dap.listeners.before.event_terminated["dapui_config"] = function()
+                dapui.close()
+            end
+            dap.listeners.before.event_exited["dapui_config"] = function()
+                dapui.close()
+            end
+        end
+    },
+    {
+        "jay-babu/mason-nvim-dap.nvim",
+        event = "VeryLazy",
+        dependencies = {
+            "williamboman/mason.nvim",
+            "mfussenegger/nvim-dap",
+        },
+        opts = {
+            handlers = {}
+        },
+    },
+    {
+        "mfussenegger/nvim-dap",
+    },
+
     {
         'williamboman/mason.nvim',
         config = function()
diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua
index 0d4df96..688eeb4 100644
--- a/.config/nvim/lua/plugins/lspconfig.lua
+++ b/.config/nvim/lua/plugins/lspconfig.lua
@@ -48,14 +48,19 @@ local capabilities = vim.tbl_deep_extend(
     require('cmp_nvim_lsp').default_capabilities()
 )
 
+local setup = {
+    on_attach = on_attach,
+    flags = lsp_flags,
+    capabilities = capabilities,
+}
 mason_lspconfig.setup_handlers {
 
     -- This is a default handler that will be called for each installed server (also for new servers that are installed during a session)
     function(server_name)
-        lspconfig[server_name].setup {
-            on_attach = on_attach,
-            flags = lsp_flags,
-            capabilities = capabilities,
-        }
+        lspconfig[server_name].setup { setup }
     end,
 }
+
+lspconfig["ocamllsp"].setup {
+    setup
+}
diff --git a/.config/nvim/lua/plugins/none-ls.lua b/.config/nvim/lua/plugins/none-ls.lua
index 2ed07ca..e10986f 100644
--- a/.config/nvim/lua/plugins/none-ls.lua
+++ b/.config/nvim/lua/plugins/none-ls.lua
@@ -6,7 +6,6 @@ null_ls.setup({
         null_ls.builtins.formatting.rustfmt,
         null_ls.builtins.formatting.blue,
         null_ls.builtins.formatting.gofmt,
-        null_ls.builtins.formatting.clang_format,
         null_ls.builtins.code_actions.shellcheck,
         null_ls.builtins.formatting.prettierd.with({
             filetypes = { "html", "json", "css", "js", "yaml", "markdown" },