From 5c88edfa7041a5fa36a39ec68c64a2b0b4592389 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Fri, 20 Dec 2024 16:58:35 +0200 Subject: [PATCH] Update 2024-12-20 --- foo.bru | 118 -------------------------------------- lazy-lock.json | 34 +++++------ lua/plugins/autopairs.lua | 1 - lua/plugins/conform.lua | 21 ++----- lua/plugins/telescope.lua | 8 +-- lua/solo/autocmds.lua | 7 +++ plugin/menu.lua | 38 ++++++++++++ 7 files changed, 70 insertions(+), 157 deletions(-) delete mode 100644 foo.bru create mode 100644 plugin/menu.lua diff --git a/foo.bru b/foo.bru deleted file mode 100644 index 2d29324..0000000 --- a/foo.bru +++ /dev/null @@ -1,118 +0,0 @@ -meta { - name: create Zaao Task - type: http - seq: 2 -} - -post { - url: {{baseUrl}}/api/zaao/tasks/ - body: json - auth: inherit -} - -headers { - Accept: application/json -} - -body:json { - [{ - "address": "{{address}}", - "coord_x": {{coord_x}}, - "coord_y": {{coord_y}}, - "date": "{{date}}", - "remote_id": "{{remote_id}}", - "route_number": "{{route_number}}", - "route_type": "{{route_type}}", - "sequence": {{sequence}}, - "status": "{{status}}", - "task_type": "{{task_type}}", - "client_name": "{{client_name}}", - "contacts": "{{contacts}}", - "container_number": "{{container_number}}", - "container_type": "{{container_type}}", - "container_volume": {{container_volume}}, - "pickup_coord_x": "{{pickup_coord_x}}", - "pickup_coord_y": "{{pickup_coord_y}}", - "contract_id": "{{contract_id}}", - "waste_type": "{{waste_type}}", - "emptied_volume": "{{emptied_volume}}", - "extra_addition_in_prcnt": "{{extra_addition_in_prcnt}}", - "additional_volume": {{additional_volume}}, - "container_full_nearby": "{{container_full_nearby}}", - "execution_time": "{{execution_time}}", - "comment": "{{comment}}", - "additional_information": "{{additional_information}}", - "driver_comment": "{{driver_comment}}", - "client_debt": "{{client_debt}}", - "vehicle": {{vehicle}} - }, - { - "remote_id": "string", - "date": "2019-08-24", - "route_number": "string", - "sequence": 2147483647, - "address": "string", - "client_name": "string", - "contacts": "string", - "container_number": "string", - "container_volume": {{container_volume}}, - "coord_x": {{coord_x}}, - "coord_y": {{coord_y}}, - "pickup_coord_x": {{pickup_coord_x}}, - "pickup_coord_y": {{pickup_coord_y}}, - "contract_id": "string", - "waste_type": "string", - "task_type": "string", - "route_type": "string", - "emptied_volume": {{emptied_volume}}, - "extra_addition_in_prcnt": {{extra_addition_in_prcnt}}, - "additional_volume": {{additional_volume}}, - "container_full_nearby": "string", - "execution_time": "2019-08-24T14:15:22Z", - "status": "string", - "comment": "string", - "additional_information": "string", - "driver_comment": "string", - "client_debt": 0.1, - "driver": 3, - "vehicle": {{vehicle}} - }] -} - -script:pre-request { - const { faker } = require("@faker-js/faker"); - bru.setVar("address", faker.location.streetAddress({ useFullAddress:true })); - bru.setVar("coord_x", faker.location.longitude({ precision: 6 })); - bru.setVar("coord_y", faker.location.latitude({ precision: 6 })); - bru.setVar("date", faker.date.anytime().toISOString().split("T")[0]); - bru.setVar("remote_id", `T-${String(faker.number.int({ min: 1, max: 999 })).padStart(3, '0')}`); - bru.setVar("route_number", `R-${String(faker.number.int({ min: 1, max: 999 })).padStart(3, '0')}`); - bru.setVar("route_type", "Test"); - bru.setVar("sequence", faker.number.int({ min: 1, max: 50 })); - bru.setVar("status", faker.helpers.arrayElement(["Pending", "Completed", "Not Completed", "Blocked", "Customer Unavailable"])); - bru.setVar("task_type", faker.helpers.arrayElement(["SA", "NE"])); - bru.setVar("client_name", faker.person.fullName()); - bru.setVar("contacts", faker.phone.number({ style: "international" })); - bru.setVar("container_number", `C-${String(faker.number.int({ min: 1, max: 9999 })).padStart(4, '0')}`); - bru.setVar("container_type", faker.helpers.arrayElement(["STD", "BIO", "REC", "45M3"])); - bru.setVar("container_volume", faker.number.float({ multipleOf: 0.25, min: 0.25, max: 50 })); - bru.setVar("pickup_coord_x", faker.location.longitude({ precision: 6 })); - bru.setVar("pickup_coord_y", faker.location.latitude({ precision: 6 })); - bru.setVar("contract_id", `CONTRACT-${String(faker.number.int({ min: 1, max: 999 })).padStart(3, '0')}`); - bru.setVar("waste_type", faker.helpers.arrayElement(["STD", "ELEC", "NON_STD"])); - bru.setVar("emptied_volume", faker.number.int({ min: 0, max: 1000 })); - bru.setVar("extra_addition_in_prcnt", faker.number.float({ min: 0, max: 100, fractionDigits: 3 })); - bru.setVar("additional_volume", faker.number.float({ multipleOf: 0.25, min: 0, max: 10})); - bru.setVar("container_full_nearby", "yes"); - bru.setVar("execution_time", faker.date.anytime().toISOString()); - bru.setVar("comment", faker.lorem.sentence()); - bru.setVar("additional_information", faker.lorem.sentence()); - bru.setVar("driver_comment", faker.lorem.sentence()); - bru.setVar("client_debt", faker.number.float()); - bru.setVar("driver", faker.number.int({ min: 2, max: 11 })); - bru.setVar("vehicle", faker.number.int({ min: 1, max: 20 })); -} - -docs { - Handle POST requests to create ZaaoTask objects in bulk. -} diff --git a/lazy-lock.json b/lazy-lock.json index 23d2d91..36982ea 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -33,7 +33,7 @@ "decisive.nvim": { "branch": "main", "commit": "a7251adebccbc9c899cff39a524b20d06e2b78b5" }, "demicolon.nvim": { "branch": "main", "commit": "ee6e3008c7e70abe3f58103dde49145699700fc5" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dracula.nvim": { "branch": "main", "commit": "e6128ec3923b92bb2b16e81b4a0f04ed0308038e" }, + "dracula.nvim": { "branch": "main", "commit": "515acae4fd294fcefa5b15237a333c2606e958d1" }, "flow.nvim": { "branch": "main", "commit": "9005b613fc31d8334db2f1687c594f0b7e29823d" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "garbage-day.nvim": { "branch": "main", "commit": "750ef08ae6031ee3683014c5349144340c08ead6" }, @@ -65,11 +65,11 @@ "markdown-table-mode.nvim": { "branch": "main", "commit": "870d0449c1c78c673faa9637a63036f9537b4caa" }, "markdown-togglecheck": { "branch": "main", "commit": "5e9ee3184109a102952c01ef816babe8835b299a" }, "markdown.nvim": { "branch": "master", "commit": "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "melange.nvim": { "branch": "master", "commit": "9252c78c7bffd3126b0c9e47e51e0b5211acffb1" }, - "neoconf.nvim": { "branch": "main", "commit": "9d5b46e60f26978b2edeb132086bb8a88a1821d0" }, + "neoconf.nvim": { "branch": "main", "commit": "a9562ad062a1611a10cc81815b220a4450fb2cad" }, "neocord": { "branch": "main", "commit": "4d55d8dab2d5f2f272192add7a2c21982039c699" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neogen": { "branch": "main", "commit": "dc50715c009f89b8111197fd2f282f6042daa7ea" }, @@ -80,35 +80,35 @@ "neotest-gtest": { "branch": "main", "commit": "16989561a6356878ec4ecd6afed4f0d7a471d1db" }, "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" }, "neotest-vim-test": { "branch": "master", "commit": "75c4228882ae4883b11bfce9b8383e637eb44192" }, - "nightfly.nvim": { "branch": "master", "commit": "52519368c21296ad8913d71bdab33252755ba341" }, + "nightfly.nvim": { "branch": "master", "commit": "f1176605eb01b38d84e0e9e221c9599bd022dfd4" }, "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" }, "nui-components.nvim": { "branch": "main", "commit": "caecfe2089e5ffbe99c2b0e0468da91990263a90" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, "nvim-cmp-lsp-rs": { "branch": "main", "commit": "57f29333e6d2b655d5b0edb999b0006d49fde0ca" }, "nvim-colorizer.lua": { "branch": "master", "commit": "4acf88d31b3a7a1a7f31e9c30bf2b23c6313abdb" }, - "nvim-dap": { "branch": "master", "commit": "567da83810dd9da32f9414d941bc6848715fc102" }, + "nvim-dap": { "branch": "master", "commit": "04ce47fc5a6ef2b717f33c320fc003091cebac40" }, "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, "nvim-dbee": { "branch": "master", "commit": "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853" }, - "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" }, - "nvim-lspconfig": { "branch": "master", "commit": "ae8a01bb40848490548e5d07b97ed972ed43c2f9" }, + "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" }, + "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-silicon": { "branch": "main", "commit": "9fe6001dc8cad4d9c53bcfc8649e3dc76ffa169c" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, - "nvim-treesitter": { "branch": "master", "commit": "5cf3434c694a94fccfca79588654e57053a68572" }, + "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" }, "nvim-treesitter-context": { "branch": "master", "commit": "8fd989b6b457a448606b4a2e51f9161700f609a7" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-ufo": { "branch": "main", "commit": "95cbe2e99901135704aabdc8732d722cf68b12c9" }, - "nvim-web-devicons": { "branch": "master", "commit": "1736cb81bdc42e1ee206081a161bdb2af68fb7a1" }, + "nvim-ufo": { "branch": "main", "commit": "270ca542dae992ffe40274718c63645217ebc8bf" }, + "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" }, "ohne-accidents": { "branch": "main", "commit": "832b942a928e74b537a2526eacc6285e26af9589" }, "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" }, - "otter.nvim": { "branch": "main", "commit": "ca9ce67d0399380b659923381b58d174344c9ee7" }, + "otter.nvim": { "branch": "main", "commit": "7edd39c920f7a28ac711a7c658a7cfdfb804bc82" }, "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, @@ -117,11 +117,11 @@ "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "py-requirements.nvim": { "branch": "main", "commit": "3cf563817a1a976691e4c17538b03143544b19f3" }, "pymple.nvim": { "branch": "main", "commit": "110cc9499b89f2b7230a0c3a7332b3e4b1ac5b7b" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "8d9a5debf473658c0d1d73fcb51bad1d9aecbf75" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "77e5bad54227dcfe3878ffbda88ab1efdaacb475" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, "rose-pine.nvim": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" }, - "runner.nvim": { "branch": "main", "commit": "9ae6f56b73471174c6c4d47581007c6781fb6b6e" }, - "rustaceanvim": { "branch": "master", "commit": "a244210b28f9055c2b4cfa85c92c8a71c13671c9" }, + "runner.nvim": { "branch": "main", "commit": "eb089f54a675d7cf5e5b3c4fd6700971e61a095c" }, + "rustaceanvim": { "branch": "master", "commit": "0a618c1d1c05a8059880076feccb15301da6993d" }, "spellwarn.nvim": { "branch": "main", "commit": "12734b47b008d912b4925c0bc2c1248eb534409d" }, "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" }, "tagbar": { "branch": "master", "commit": "5e090da54bf999c657608b6c8ec841ef968d923d" }, @@ -140,13 +140,13 @@ "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, - "tree-sitter-bruno": { "branch": "main", "commit": "4c8da45da6537ab8c27018b9f2cf92768f9123c2" }, + "tree-sitter-bruno": { "branch": "main", "commit": "5f35d5970be9e583eabdd1c22911953180729f84" }, "treesitter-utils": { "branch": "main", "commit": "df621499e4227f0476f6f4bdb75a9d8dd18d16f2" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "typecheck.nvim": { "branch": "main", "commit": "38f3c135572a287f468bae269f956f4ba53dbddf" }, "typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" }, - "typst-preview.nvim": { "branch": "master", "commit": "ebf10fabde7406848d165b1ef13bce5d046195be" }, + "typst-preview.nvim": { "branch": "master", "commit": "23db1bd5a32ff0b346817ed72e615c6419b11f48" }, "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, "vim-be-good": { "branch": "master", "commit": "0ae3de14eb8efc6effe7704b5e46495e91931cc5" }, "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, diff --git a/lua/plugins/autopairs.lua b/lua/plugins/autopairs.lua index ff92c02..91a0670 100644 --- a/lua/plugins/autopairs.lua +++ b/lua/plugins/autopairs.lua @@ -1,7 +1,6 @@ return { "windwp/nvim-autopairs", event = "InsertEnter", - enabled = false, opts = { disable_filetype = { "TelescopePrompt", "spectre_panel" }, disable_in_macro = true, -- disable when recording or executing a macro diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 90e115b..1ca9caa 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -7,7 +7,7 @@ return { { "f", function() - require("conform").format({ async = true, lsp_fallback = true }) + require("conform").format({ async = true, lsp_fallback = "fallback" }) end, mode = "", desc = "[F]ormat buffer", @@ -18,7 +18,7 @@ return { lua = { "stylua" }, css = { "prettier" }, scss = { "prettier" }, - python = { "ruff", "ruff_fix", "ruff_organize_imports" }, + python = { "ruff_format", "ruff_fix", "ruff_organize_imports" }, go = { "goimports", "gofmt" }, javascript = js, javascriptreact = js, @@ -39,19 +39,10 @@ return { yaml = { "yamlfmt" }, ["_"] = { "trim_whitespace" }, }, - format_on_save = function(bufnr) - -- Disable formatting for .bru files - local bufname = vim.api.nvim_buf_get_name(bufnr) - if bufname:match("%.bru$") then - return false - end - - -- Return normal format settings for other files - return { - timeout_ms = 500, - lsp_fallback = true, - } - end, + format_on_save = { + timeout_ms = 500, + lsp_format = "fallback", + }, log_level = vim.log.levels.ERROR, notify_on_error = true, }, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index b75cfce..e1f0dee 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -21,16 +21,12 @@ return { keys = { { "", - function() - require("telescope.builtin").git_files(require("telescope.themes").get_dropdown({ previewer = false })) - end, + require("telescope.builtin").git_files, desc = "Telescope git_files", }, { "pf", - function() - require("telescope.builtin").find_files(require("telescope.themes").get_dropdown({ previewer = false })) - end, + require("telescope.builtin").find_files, desc = "[F]iles", }, { diff --git a/lua/solo/autocmds.lua b/lua/solo/autocmds.lua index bbea0c4..6fe9e65 100644 --- a/lua/solo/autocmds.lua +++ b/lua/solo/autocmds.lua @@ -34,6 +34,13 @@ vim.api.nvim_create_autocmd({ "TextYankPost" }, { end, }) +-- Format File on Save +vim.api.nvim_create_autocmd({ "BufWritePre" }, { + callback = function() + vim.lsp.buf.format() + end, +}) + -- Center on InsertEnter vim.api.nvim_create_autocmd({ "InsertEnter" }, { callback = function() diff --git a/plugin/menu.lua b/plugin/menu.lua new file mode 100644 index 0000000..a496c3b --- /dev/null +++ b/plugin/menu.lua @@ -0,0 +1,38 @@ +vim.cmd([[ + aunmenu PopUp + anoremenu PopUp.Inspect Inspect + amenu PopUp.-1- Inspect + anoremenu PopUp.Definition lua vim.lsp.buf.definition() + anoremenu PopUp.References Telescope lsp_references + nnoremenu PopUp.Back + amenu PopUp.-2- Inspect + amenu PopUp.URL gx +]]) + +local group = vim.api.nvim_create_augroup("nvim_popupmenu", { clear = true }) +vim.api.nvim_create_autocmd("MenuPopup", { + pattern = "*", + group = group, + desc = "Custom PopUp Setup", + callback = function() + vim.cmd([[ + amenu disable PopUp.-1- + amenu disable PopUp.Definition + amenu disable PopUp.References + amenu disable PopUp.URL + ]]) + if vim.lsp.get_clients({ bufnr = 0 })[1] then + vim.cmd([[ + amenu enable PopUp.Definition + amenu enable PopUp.References + ]]) + end + local urls = require("vim.ui")._get_urls() + if vim.startswith(urls[1], "http") then + vim.cmd([[ + amenu disable Popup.-2- + amentu enable PopUp.URL + ]]) + end + end, +})