Merge remote-tracking branch 'origin/main'

Nanamiiiii · Jun 27, 2024 · 52ee57b · 52ee57b
2 parents 3632e59 + 488c912
commit 52ee57b
Show file tree

Hide file tree

Showing 19 changed files with 779 additions and 283 deletions.
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
@@ -117,4 +117,13 @@ return {
             "nvim-tree/nvim-web-devicons",
         },
     },
+    {
+        "aznhe21/actions-preview.nvim",
+        dependencies = {
+            'nvim-telescope/telescope.nvim',
+        },
+        keys = {
+            { "<leader>ca", function() require("actions-preview").code_actions() end, desc = "Preview Code Actions", mode = "n" },
+        }
+    }
 }
diff --git a/nvim/lua/plugins/trouble.lua b/nvim/lua/plugins/trouble.lua
@@ -4,24 +4,39 @@ return {
     {
         "folke/trouble.nvim",
         dependencies = { "nvim-tree/nvim-web-devicons" },
-        config = function()
-            require("trouble").setup()
-            vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>", { silent = true, noremap = true })
-            vim.keymap.set(
-                "n",
-                "<leader>xw",
-                "<cmd>TroubleToggle workspace_diagnostics<cr>",
-                { silent = true, noremap = true }
-            )
-            vim.keymap.set(
-                "n",
-                "<leader>xd",
-                "<cmd>TroubleToggle document_diagnostics<cr>",
-                { silent = true, noremap = true }
-            )
-            vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>", { silent = true, noremap = true })
-            vim.keymap.set("n", "<leader>xq", "<cmd>TroubleToggle quickfix<cr>", { silent = true, noremap = true })
-            vim.keymap.set("n", "gR", "<cmd>TroubleToggle lsp_references<cr>", { silent = true, noremap = true })
-        end,
-    },
+        opts = {},
+        cmd = "Trouble",
+        keys = {
+            {
+                "<leader>xx",
+                "<cmd>Trouble diagnostics toggle<cr>",
+                desc = "Diagnostics (Trouble)",
+            },
+            {
+                "<leader>xX",
+                "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+                desc = "Buffer Diagnostics (Trouble)",
+            },
+            {
+                "<leader>cs",
+                "<cmd>Trouble symbols toggle focus=false<cr>",
+                desc = "Symbols (Trouble)",
+            },
+            {
+                "<leader>cl",
+                "<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+                desc = "LSP Definitions / references / ... (Trouble)",
+            },
+            {
+                "<leader>xL",
+                "<cmd>Trouble loclist toggle<cr>",
+                desc = "Location List (Trouble)",
+            },
+            {
+                "<leader>xQ",
+                "<cmd>Trouble qflist toggle<cr>",
+                desc = "Quickfix List (Trouble)",
+            },
+        },
+    }
 }
diff --git a/scripts/yabai_notch_reset.sh b/scripts/yabai_notch_reset.sh
@@ -4,8 +4,8 @@
 # on M1 or later macbook, the notch space working as padding
 DISPLAY_UUID=37D8832A-2D66-02CA-B9F7-8F30A301B230 # UUID of built-in display
 
-BAR_PADDING=50
-DEFAULT_PADDING=12
+BAR_PADDING=45
+DEFAULT_PADDING=5
 
 SPACES_ON_SUB=$(yabai -m query --displays | jq ".[] | select(.uuid != \"${DISPLAY_UUID}\") | .spaces[]")
 SPACES_ON_BUILTIN=$(yabai -m query --displays | jq ".[] | select(.uuid == \"${DISPLAY_UUID}\") | .spaces[]")

diff --git a/sketchybar/colors.lua b/sketchybar/colors.lua
@@ -3,13 +3,13 @@ return {
     white = 0xffc0caf5,
     white_dark = 0xff343b58,
     red = 0xfff7768e,
-    red_dark = 0xff8c4351,
+    red_dark = 0xffba5065,
     green = 0xff9ece6a,
     blue = 0xff7aa2f7,
     yellow = 0xffe0af68,
-    yellow_dark = 0xff8f5e15,
+    yellow_dark = 0xffbd7c1a,
     orange = 0xffff9e64,
-    orange_dark = 0xff965027,
+    orange_dark = 0xffc46731,
     magenta = 0xffbb9af7,
     grey = 0xffa9b1d6,
     transparent = 0x00000000,