From 1b406704ad37c704258a3c4f0b8dbd501edf6604 Mon Sep 17 00:00:00 2001
From: "Radu Macocian (admac)" <admac@odoo.com>
Date: Fri, 12 Jun 2026 16:56:09 +0200
Subject: [PATCH] Fixed tidal

---
 .config/nvim/after/plugin/lspconfig.lua  |  3 +-
 .config/nvim/after/plugin/tidal-nvim.lua | 72 ++++++++++++++++++++++++
 .config/nvim/lua/wicked/lazy.lua         |  9 +--
 3 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua
index 134363a..7d51656 100644
--- a/.config/nvim/after/plugin/lspconfig.lua
+++ b/.config/nvim/after/plugin/lspconfig.lua
@@ -23,6 +23,7 @@ vim.lsp.config("angularls", {
     end
 })
 vim.lsp.config("ruff", {})
+vim.lsp.config("gopls", {})
 vim.lsp.config("cssls", {})
 vim.lsp.config("lua_ls", {})
 vim.lsp.config("hls", {})
@@ -55,7 +56,7 @@ vim.lsp.config("eslint", {
     end,
 })
 
-vim.lsp.enable({ "angularls", "ts_ls", "odoo_ls", "hls", "ruff", "eslint", "cssls", "lua_ls", "lemminx", "qmlls" })
+vim.lsp.enable({ "angularls", "ts_ls", "odoo_ls", "hls", "ruff", "eslint", "cssls", "lua_ls", "lemminx", "qmlls", "gopls" })
 
 vim.api.nvim_create_autocmd('LspAttach', {
     group = vim.api.nvim_create_augroup('user_lsp_attach', { clear = true }),
diff --git a/.config/nvim/after/plugin/tidal-nvim.lua b/.config/nvim/after/plugin/tidal-nvim.lua
index 1a76bd7..7d4d36e 100644
--- a/.config/nvim/after/plugin/tidal-nvim.lua
+++ b/.config/nvim/after/plugin/tidal-nvim.lua
@@ -1,2 +1,74 @@
 vim.keymap.set("n", "<leader>tl", "<cmd>TidalLaunch<cr>")
 vim.keymap.set("n", "<leader>tq", "<cmd>TidalQuit<cr>")
+
+local scd = os.getenv("HOME") .. "/.local/share/tidal/BootSuperDirt.scd"
+
+local function superdirt_running()
+    local id = vim.g.superdirt_job
+    return id and id > 0 and vim.fn.jobwait({ id }, 0)[1] == -1
+end
+
+local function log_buf()
+    local b = vim.g.superdirt_buf
+    if not (b and vim.api.nvim_buf_is_valid(b)) then
+        b = vim.api.nvim_create_buf(false, true)
+        vim.api.nvim_buf_set_name(b, "SuperDirt")
+        vim.g.superdirt_buf = b
+    end
+    return b
+end
+
+local function append(_, data)
+    if not data then return end
+    vim.schedule(function()
+        local lines = {}
+        for _, l in ipairs(data) do
+            l = l:gsub("\r", "")
+            table.insert(lines, l)
+            if l:match("SuperDirt:%s*listening") then
+                vim.notify("SuperDirt ready", vim.log.levels.INFO)
+            elseif l:match("ERROR") then
+                vim.notify("SuperDirt: " .. l, vim.log.levels.ERROR)
+            end
+        end
+        vim.api.nvim_buf_set_lines(log_buf(), -1, -1, false, lines)
+    end)
+end
+
+vim.api.nvim_create_user_command("SuperDirtLog", function()
+    vim.cmd("botright split")
+    vim.api.nvim_win_set_buf(0, log_buf())
+end, { desc = "Open SuperDirt output log" })
+
+local group = vim.api.nvim_create_augroup("TidalSuperDirt", { clear = true })
+
+vim.api.nvim_create_autocmd("User", {
+    group = group,
+    pattern = "TidalLaunch",
+    callback = function()
+        if superdirt_running() then
+            vim.notify("SuperDirt already running", vim.log.levels.INFO)
+            return
+        end
+        vim.fn.deletebufline(log_buf(), 1, "$")
+        vim.g.superdirt_job = vim.fn.jobstart({ "sclang", scd }, {
+            on_stdout = append,
+            on_stderr = append,
+            on_exit = function() vim.g.superdirt_job = nil end,
+        })
+        if vim.g.superdirt_job <= 0 then
+            vim.notify("Failed to start sclang (is SuperCollider installed?)", vim.log.levels.ERROR)
+        else
+            vim.notify("Booting SuperDirt... (:SuperDirtLog for output)", vim.log.levels.INFO)
+        end
+    end,
+})
+
+vim.api.nvim_create_autocmd("VimLeavePre", {
+    group = group,
+    callback = function()
+        if superdirt_running() then
+            vim.fn.jobstop(vim.g.superdirt_job)
+        end
+    end,
+})
diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua
index bce492a..8946059 100644
--- a/.config/nvim/lua/wicked/lazy.lua
+++ b/.config/nvim/lua/wicked/lazy.lua
@@ -35,18 +35,11 @@ require("lazy").setup({
             end,
         },
         {
-            "thgrund/tidal.nvim",
+            "https://codeberg.org/MrReason/tidal.nvim",
             opts = {
                 boot = {
                     tidal = {
                         cmd = os.getenv("HOME") .. "/.ghcup/bin/ghci",
-                        highlight = {
-                            autostart = true,
-                        },
-                    },
-                    sclang = {
-                        enabled = true,
-                        file = os.getenv("HOME") .. "/.local/share/tidal/BootSuperDirt.scd",
                     },
                 },
             },