[fix] I don't even know

config/nvim/lazy-lock.json

@@ -1,51 +0,0 @@
-{
-  "comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" },
-  "copilot.vim": { "branch": "release", "commit": "b6e5624351ba735e25eb8864d7d22819aad00606" },
-  "coq.artifacts": { "branch": "artifacts", "commit": "551ee8e34fe4d24252ee0c20f51357b78a52d3c7" },
-  "coq.thirdparty": { "branch": "3p", "commit": "4ff6cd4ca34876e231743db480aef699a3ebea98" },
-  "coq_nvim": { "branch": "coq", "commit": "d9eaa12329b4f48a5e6c29ed6a0b9217ebf67f23" },
-  "d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" },
-  "diffview.nvim": { "branch": "main", "commit": "63720aa5a70ce4aa386be407d0e612cd9e63861a" },
-  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "formatter.nvim": { "branch": "master", "commit": "9c44c9d80863aef1cef5b5c354c393ed5d74e634" },
-  "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" },
-  "git-conflict.nvim": { "branch": "main", "commit": "f2ed4dc910a7dd23f1762fc57c1986cfd210283b" },
-  "glow.nvim": { "branch": "main", "commit": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
-  "lazy.nvim": { "branch": "main", "commit": "5c89dc52f42e5058a46b0912d7d9042f564e44e0" },
-  "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "72b0d4ece23338fe2d03fc7b6fd8c8bace6bb441" },
-  "lspsaga.nvim": { "branch": "main", "commit": "c483c9b43fa6cb47fb8c18a8ebd4ece45bbf07f4" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "7034065099c1665143091c7282b3b1b8f0b23783" },
-  "mason.nvim": { "branch": "main", "commit": "b20a4bd32247411d39d8dd5c94e2e5c87d98556d" },
-  "no-neck-pain.nvim": { "branch": "main", "commit": "33db10e593edc7d720c0f5c0320899bd1dd014e1" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" },
-  "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "eddaef928c1e1dd79a96f5db45f2fd7f2efe7ea0" },
-  "nvim-treesitter": { "branch": "master", "commit": "831f37635df26864a397a5e35450eec97bfe60cd" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "0d730df898f3dc27fd88f03cfa6d26d2405554b4" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
-  "octo.nvim": { "branch": "master", "commit": "f37efab489a99b4a104e5ee18c73453d5e828b62" },
-  "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
-  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
-  "rest.nvim": { "branch": "main", "commit": "df826bc0a76d5eb79b458db894d47a5538b454fe" },
-  "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
-  "sonokai": { "branch": "master", "commit": "95d0ed42b40e6e050b4f0e5f08a7bf7b348f7808" },
-  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
-  "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
-  "telescope.nvim": { "branch": "master", "commit": "6258d50b09f9ae087317e392efe7c05a7323492d" },
-  "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
-  "toggleterm.nvim": { "branch": "main", "commit": "1c5996ee3c30b54751093fe68d40676859e7778f" },
-  "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" },
-  "vim-abolish": { "branch": "master", "commit": "cb3dcb220262777082f63972298d57ef9e9455ec" },
-  "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
-  "vim-fugitive": { "branch": "master", "commit": "e6651a79facf5cc2b7c554fdc19eb8a9fe89602c" },
-  "vim-mergetool": { "branch": "master", "commit": "0275a85256ad173e3cde586d54f66566c01b607f" },
-  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
-  "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
-  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
-  "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
-  "which-key.nvim": { "branch": "main", "commit": "94cb020ff33a1e0e22fac1c41663d2c439741f17" }
-}

config/nvim/lua/colorscheme.lua

@@ -1,36 +1,40 @@
 local vim = vim
 vim.o.termguicolors = true
-vim.cmd [[colorscheme sonokai]]
+vim.cmd.colorscheme "sonokai"
+-- vim.cmd [[colorscheme sonokai]]
+-- require("catppuccin").setup({
+--     -- flavour = "mocha",
+--     background = { -- :h background
+--         light = "latte",
+--         dark = "mocha",
+--     },
+-- })
 local colors = {
-    black = '#181819',
+    black       = '#181819',
-    bg0   = '#2c2e34',
+    bg0         = '#2c2e34',
-    bg1   = '#30323a',
+    bg1         = '#30323a',
-    bg2   = '#363944',
+    bg2         = '#363944',
-    bg3   = '#3b3e48',
+    bg3         = '#3b3e48',
-    bg4   = '#414550',
+    bg4         = '#414550',
-
+    bg_red      = '#ff6077',
-    bg_red   = '#ff6077',
+    diff_red    = '#55393d',
-    diff_red = '#55393d',
+    bg_green    = '#a7df78',
-
+    diff_green  = '#394634',
-    bg_green   = '#a7df78',
+    bg_blue     = '#85d3f2',
-    diff_green = '#394634',
+    diff_blue   = '#354157',
-
-    bg_blue   = '#85d3f2',
-    diff_blue = '#354157',
-
     diff_yellow = '#4e432f',
     fg          = '#e2e2e3',
-
+    red         = '#fc5d7c',
-    red    = '#fc5d7c',
+    orange      = '#f39660',
-    orange = '#f39660',
+    yellow      = '#e7c664',
-    yellow = '#e7c664',
+    green       = '#9ed072',
-    green  = '#9ed072',
+    blue        = '#76cce0',
-    blue   = '#76cce0',
+    purple      = '#b39df3',
-    purple = '#b39df3',
+    grey        = '#7f8490',
-    grey   = '#7f8490',
+    none        = 'NONE',
-    none   = 'NONE',
 }
 
+-- vim.cmd.colorscheme "catppuccin"
 -- Override some colors
 vim.cmd('hi Normal guibg=' .. colors.black)
 vim.cmd('hi NormalNC guibg=' .. colors.black)

config/nvim/lua/keymaps.lua

@@ -47,7 +47,8 @@ local normal_mode_maps = {
     { key = '<leader>rr',       map = [[<cmd>RustRunnables<cr>]] },
     { key = 'vff',              map = [[<cmd>vertical Gdiffsplit<cr>]] },
     { key = 'vff!',             map = [[<cmd>vertical Gdiffsplit!<cr>]] },
-    { key = 'ssr',              map = [[<cmd>lua require'rust-tools'.ssr.ssr(query)<cr>]] },
+    -- { key = 'ssr',              map = [[<cmd>lua require'rust-tools'.ssr.ssr(query)<cr>]] },
+    { key = 'ssr',              map = [[<cmd>lua require("ssr").open()<cr>]] },
     { key = '<C-\\>',           map = [[<cmd>ToggleTerm<cr>]] },
 
     -- Session
@@ -77,7 +78,6 @@ local normal_mode_maps = {
         map = [[<cmd>lua require('telescope.builtin').lsp_incoming_calls({fname_width = 40})<cr>]] },
     { key = '<leader>e',
         map = [[<Plug>RestNvim<cr>]] },
-
     { key = '<C-c>', map = [[<cmd>Telescope commands<cr>]] },
     -- { key = '<ScrollWheelDown>', map = [[<cmd>call comfortable_motion#flick(40)<cr>]], options = { silent = true } },
     -- { key = '<ScrollWheelUp>', map = [[<cmd>call comfortable_motion#flick(-40)<cr>]], options = { silent = true } },

config/nvim/lua/plugins.lua

@@ -37,7 +37,7 @@ return require('lazy').setup({
     -- 'b0o/SchemaStore.nvim',
     -- 'rcarriga/nvim-notify',
     { 'folke/todo-comments.nvim',      event = "BufEnter" },
-    { 'github/copilot.vim',            event = "LspAttach" },
+    { 'github/copilot.vim',            event = "LspAttach", cmd = "Copilot" },
     -- 'ggandor/leap.nvim',
     {
         'shortcuts/no-neck-pain.nvim',
@@ -60,6 +60,14 @@ return require('lazy').setup({
             require('colorscheme')
         end
     },
+    -- {
+    --     "catppuccin/nvim",
+    --     name = "catppuccin",
+    --     lazy = false,
+    --     config = function()
+    --         require('colorscheme')
+    --     end
+    -- },
     { 'folke/which-key.nvim',        config = function() require("which-key").setup() end },
     { 'nvim-telescope/telescope.nvim',
         cmd = "Telescope",
@@ -166,7 +174,7 @@ return require('lazy').setup({
         end,
     },
     { 'neovim/nvim-lspconfig',
-        ft = { "rust", "toml", "lua", "c", "cpp", "markdown" },
+        ft = { "rust", "toml", "lua", "c", "cpp", "markdown", "sql" },
         config = function()
             require("lsp")
         end
@@ -175,15 +183,15 @@ return require('lazy').setup({
         'nvim-lua/lsp-status.nvim',
         event = "LspAttach"
     },
-    {
+    -- {
-        'ray-x/lsp_signature.nvim',
+    --     'ray-x/lsp_signature.nvim',
-        event = "LspAttach",
+    --     -- event = "LspAttach",
-        config = function()
+    --     config = function()
-            require("lsp_signature").setup({
+    --         require("lsp_signature").setup({
-                floating_window_above_cur_line = true,
+    --             floating_window_above_cur_line = true,
-            })
+    --         })
-        end,
+    --     end,
-    },
+    -- },
     {
         'terrastruct/d2-vim',
         ft = "d2",
@@ -314,7 +322,29 @@ return require('lazy').setup({
         config = function()
             require("fidget").setup({})
         end
+    },
+    {
+        "cshuaimin/ssr.nvim",
+        module = "ssr",
+        -- Calling setup is optional.
+        config = function()
+            require("ssr").setup {
+                border = "rounded",
+                min_width = 50,
+                min_height = 5,
+                max_width = 120,
+                max_height = 25,
+                keymaps = {
+                    close = "q",
+                    next_match = "n",
+                    prev_match = "N",
+                    replace_confirm = "<cr>",
+                    replace_all = "<leader><cr>",
+                },
+            }
+        end
     }
+
 }, {
     defaults = {
         lazy = true,

config/nvim/lua/setup/rust-tools.lua

@@ -6,7 +6,7 @@ local codelldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lld
 local liblldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lldb-1.8.1-universal/lldb/lib/liblldb.dylib'
 local rt = require('rust-tools')
 local lspstatus = require('lsp-status')
-local lsp_signature = require('lsp_signature')
+-- local lsp_signature = require('lsp_signature')
 local coq = require('coq')
 
 local opts = {
@@ -227,7 +227,7 @@ local opts = {
             vim.keymap.set("n", "<S-K>", rt.hover_actions.hover_actions, { buffer = bufnr })
             -- Code action groups
             vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
-            lsp_signature.on_attach(client, bufnr)
+            -- lsp_signature.on_attach(client, bufnr)
             lspstatus.on_attach(client)
         end,
         capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),

config/tmux/tmux.conf

@@ -13,7 +13,9 @@ set -g @dracula-show-location false
 set -g @dracula-show-fahrenheit false
 set -g @dracula-show-left-icon session
 # Theme
-set -g @plugin 'dracula/tmux'
+# set -g @plugin 'dracula/tmux'
+set -g @plugin 'catppuccin/tmux'
+set -g @catppuccin_flavour 'mocha' # or frappe, macchiato, mocha
 
 # load plugin manager
 run -b '~/.config/tmux/plugins/tpm/tpm'

config/wezterm/wezterm.lua

@@ -35,6 +35,7 @@ return {
         -- to this color to give a visual cue about the compose state.
         compose_cursor = "orange",
     },
+    -- color_scheme = "Catppuccin Mocha",
     initial_cols = 120,
     hide_tab_bar_if_only_one_tab = true,
     window_background_opacity = 0.8,
@@ -49,4 +50,5 @@ return {
     },
     window_decorations = "RESIZE",
     use_ime = false,
+
 }