From 2a58ee17e735c0ea593b25a1a2acfa877a6501a6 Mon Sep 17 00:00:00 2001
From: hakase <hakase@sakamoto.dev>
Date: Sat, 5 Apr 2025 10:09:03 -0500
Subject: [PATCH] post-update

---
 init.lua                  | 16 ++++++++++++++++
 lua/configs/conform.lua   |  3 +++
 lua/configs/lspconfig.lua | 24 +++++++++++++++---------
 lua/mappings.lua          |  3 +++
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/init.lua b/init.lua
index 92de8e8..351a8ae 100644
--- a/init.lua
+++ b/init.lua
@@ -78,3 +78,19 @@ vim.g.clipboard = {
     ['*'] = require('vim.ui.clipboard.osc52').paste('*'),
   },
 }
+
+-- Ruff and pyright cross-compatibility
+vim.api.nvim_create_autocmd("LspAttach", {
+  group = vim.api.nvim_create_augroup('lsp_attach_disable_ruff_hover', { clear = true }),
+  callback = function(args)
+    local client = vim.lsp.get_client_by_id(args.data.client_id)
+    if client == nil then
+      return
+    end
+    if client.name == 'ruff' then
+      -- Disable hover in favor of Pyright
+      client.server_capabilities.hoverProvider = false
+    end
+  end,
+  desc = 'LSP: Disable hover capability from Ruff',
+})
diff --git a/lua/configs/conform.lua b/lua/configs/conform.lua
index b315864..4e61d17 100644
--- a/lua/configs/conform.lua
+++ b/lua/configs/conform.lua
@@ -5,6 +5,9 @@ local options = {
     css = { "prettier" },
     html = { "prettier" },
     go = { "goimports", "gofmt" },
+    bash = {"beautysh"},
+    sh = {"beautysh"},
+    zsh = {"beautysh"},
   },
 
   -- format_on_save = {
diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua
index 2b9100e..eff6409 100644
--- a/lua/configs/lspconfig.lua
+++ b/lua/configs/lspconfig.lua
@@ -17,7 +17,7 @@ for _, lsp in ipairs(servers) do
 end
 
 -- typescript
-lspconfig.tsserver.setup {
+lspconfig.ts_ls.setup {
   on_attach = on_attach,
   on_init = on_init,
   capabilities = capabilities,
@@ -54,17 +54,23 @@ lspconfig.gopls.setup {
 }
 
 ---- ruff_lsp and pyright compatibility
-local on_attach = function(client, bufnr)
-  if client.name == 'ruff_lsp' then
-    -- hover in favor of Pyright
-    client.server_capabilities.hoverProvider = false
-  end
-end
-
-lspconfig.ruff_lsp.setup{
+-- local on_attach = function(client, bufnr)
+--   if client.name == 'ruff_lsp' then
+--     -- hover in favor of Pyright
+--     client.server_capabilities.hoverProvider = false
+--   end
+-- end
+--
+lspconfig.ruff.setup{
   on_attach = on_attach,
   on_init = on_init,
   capabilities = capabilities,
+  init_options = {
+    settings = {
+
+    }
+  },
 }
 
 
+
diff --git a/lua/mappings.lua b/lua/mappings.lua
index 5355f5a..64ddb89 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -3,6 +3,7 @@ require "nvchad.mappings"
 -- add yours here
 
 local map = vim.keymap.set
+local keymap = vim.api.nvim_set_keymap
 
 map("n", ";", ":", { desc = "CMD enter command mode" })
 map("i", "jk", "<ESC>")
@@ -10,6 +11,8 @@ map("i", "jk", "<ESC>")
 map("n", "<leader>md", ":MarkdownPreviewToggle <cr>")
 map("n", "<leader>tl", ":TodoLocList <cr>")
 map("n", "<leader>td", ":TodoQuickFix <cr>")
+map("n", "<leader>cr", ":!python3 % <cr>")
+
 
 
 -- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")