From 0b8dea654559d12e92c2944a15182149febc180b Mon Sep 17 00:00:00 2001 From: punkfairie <23287005+punkfairie@users.noreply.github.com> Date: Sat, 13 Apr 2024 15:06:37 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20Prepare=20to=20switch=20to?= =?UTF-8?q?=20Chezmoi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/awesome/main/layout.lua | 7 +- .config/composer/composer.json | 3 +- .config/composer/composer.lock | 618 ++++++++++++++++++-- .config/fish/conf.d/30-fzf.fish | 2 +- .config/fish/conf.d/30-gtk.fish | 2 +- .config/fish/conf.d/30-php.fish | 4 + .config/fish/fish_plugins | 4 - .config/fish/fishd.tmp.CLlvwt | 0 .config/fish/fishd.tmp.t0EB5d | 0 .config/git/hooks/prepare-commit-msg | 4 +- .config/nvim/lazyvim.json | 2 +- .config/nvim/lua/plugins/nvim-lspconfig.lua | 12 +- .config/nvim/lua/plugins/vim-gutentags.lua | 6 + .config/nvim/lua/plugins/vim-wakatime.lua | 3 + .config/nvim/lua/snippets/html.lua | 29 + .config/packages/all | 54 +- .config/razercommander/profiles | 2 +- .config/transmission/settings.json | 4 +- .config/wezterm/wezterm.lua | 2 + .gitmodules | 3 + .screenlayout/multihead.sh | 2 +- .themes/hyprland/catppuccin | 1 + .tool-versions | 2 +- .xprofile | 2 +- 24 files changed, 680 insertions(+), 88 deletions(-) delete mode 100644 .config/fish/fish_plugins create mode 100644 .config/fish/fishd.tmp.CLlvwt create mode 100644 .config/fish/fishd.tmp.t0EB5d create mode 100644 .config/nvim/lua/plugins/vim-gutentags.lua create mode 100644 .config/nvim/lua/plugins/vim-wakatime.lua create mode 100644 .config/nvim/lua/snippets/html.lua create mode 160000 .themes/hyprland/catppuccin diff --git a/.config/awesome/main/layout.lua b/.config/awesome/main/layout.lua index ef2a728..b989b09 100644 --- a/.config/awesome/main/layout.lua +++ b/.config/awesome/main/layout.lua @@ -10,9 +10,10 @@ local deck = bling.layout.deck machi.editor.nested_layouts = { ["0"] = deck, - ["1"] = awful.layout.suit.spiral, - ["2"] = awful.layout.suit.fair, - ["3"] = awful.layout.suit.fair.horizontal, + ["1"] = mstab, + ["2"] = awful.layout.suit.spiral, + ["3"] = awful.layout.suit.fair, + ["4"] = awful.layout.suit.fair.horizontal, } -- Table of layouts to cover with awful.layout.inc, order matters. diff --git a/.config/composer/composer.json b/.config/composer/composer.json index e7b6d94..7080992 100644 --- a/.config/composer/composer.json +++ b/.config/composer/composer.json @@ -1,5 +1,6 @@ { "require": { - "laravel/installer": "^5.5" + "laravel/installer": "^5.6", + "cpriego/valet-linux": "^2.3" } } diff --git a/.config/composer/composer.lock b/.config/composer/composer.lock index 2bd3b1f..c2aa15b 100644 --- a/.config/composer/composer.lock +++ b/.config/composer/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1bc764b67085124dbeb47e2fa195048c", + "content-hash": "f549eefbe875104320937dfd396c3f80", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -75,6 +75,96 @@ ], "time": "2024-02-09T16:56:22+00:00" }, + { + "name": "cpriego/valet-linux", + "version": "v2.3.10", + "source": { + "type": "git", + "url": "https://github.com/cpriego/valet-linux.git", + "reference": "321e261bfc425b06acd9cba4eab11e44cc4f6759" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cpriego/valet-linux/zipball/321e261bfc425b06acd9cba4eab11e44cc4f6759", + "reference": "321e261bfc425b06acd9cba4eab11e44cc4f6759", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-posix": "*", + "illuminate/container": "~5.3|^6.0|^7.0|^8.0|^9.0|^10.0", + "mnapoli/silly": "~1.1", + "nategood/httpful": "~0.2", + "outrightvision/api-model": "^1.0", + "php": ">=7.0", + "symfony/process": "~2.7|~3.0|~4.0|~5.0|^6.0", + "tightenco/collect": "~5.3|^6.0|^7.0|^8.0|^9.0" + }, + "require-dev": { + "mockery/mockery": "^1.2.3", + "phpunit/phpunit": "~5.5|^9.0" + }, + "bin": [ + "valet" + ], + "type": "library", + "autoload": { + "files": [ + "cli/includes/compatibility.php", + "cli/includes/facades.php", + "cli/includes/helpers.php" + ], + "psr-4": { + "Valet\\": "cli/Valet/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + }, + { + "name": "Adam Wathan", + "email": "adam.wathan@gmail.com" + }, + { + "name": "Carlos Priego", + "email": "carlos.enrique.priego@gmail.com" + }, + { + "name": "Leonardo Nodari", + "email": "nodarileonardo@gmail.com" + }, + { + "name": "JoaquĆn Marcher", + "email": "joaquin@marcher.com.uy" + }, + { + "name": "Ludovic Lemarinel", + "email": "ludovic@adesin.fr" + } + ], + "description": "A more enjoyable local development experience for Linux.", + "keywords": [ + "arch", + "fedora", + "laravel", + "linux", + "ubuntu", + "valet", + "wwdhhd", + "zonda" + ], + "support": { + "issues": "https://github.com/cpriego/valet-linux/issues", + "source": "https://github.com/cpriego/valet-linux/tree/v2.3.10" + }, + "time": "2024-02-14T10:32:47+00:00" + }, { "name": "doctrine/inflector", "version": "2.0.10", @@ -168,16 +258,16 @@ }, { "name": "illuminate/collections", - "version": "v10.47.0", + "version": "v10.48.4", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "7bc2e907285b6a38acb3b386dcc577b185bf3d73" + "reference": "f9589f1063a449111dcaa1d68285b507d9483a95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/7bc2e907285b6a38acb3b386dcc577b185bf3d73", - "reference": "7bc2e907285b6a38acb3b386dcc577b185bf3d73", + "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95", + "reference": "f9589f1063a449111dcaa1d68285b507d9483a95", "shasum": "" }, "require": { @@ -219,11 +309,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-03-04T18:11:18+00:00" + "time": "2024-03-20T20:09:13+00:00" }, { "name": "illuminate/conditionable", - "version": "v10.47.0", + "version": "v10.48.4", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -267,9 +357,60 @@ }, "time": "2023-02-03T08:06:17+00:00" }, + { + "name": "illuminate/container", + "version": "v10.48.4", + "source": { + "type": "git", + "url": "https://github.com/illuminate/container.git", + "reference": "ddc26273085fad3c471b2602ad820e0097ff7939" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939", + "reference": "ddc26273085fad3c471b2602ad820e0097ff7939", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^10.0", + "php": "^8.1", + "psr/container": "^1.1.1|^2.0.1" + }, + "provide": { + "psr/container-implementation": "1.1|2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Container\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Container package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-06-18T09:12:03+00:00" + }, { "name": "illuminate/contracts", - "version": "v10.47.0", + "version": "v10.48.4", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", @@ -317,16 +458,16 @@ }, { "name": "illuminate/filesystem", - "version": "v10.47.0", + "version": "v10.48.4", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "43cd2a29c96f447bad57332a66dac645f026b917" + "reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/43cd2a29c96f447bad57332a66dac645f026b917", - "reference": "43cd2a29c96f447bad57332a66dac645f026b917", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/592fb581a52fba43bf78c2e4b22db540c9f9f149", + "reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149", "shasum": "" }, "require": { @@ -380,11 +521,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-01-30T03:11:34+00:00" + "time": "2024-03-11T21:45:53+00:00" }, { "name": "illuminate/macroable", - "version": "v10.47.0", + "version": "v10.48.4", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -430,16 +571,16 @@ }, { "name": "illuminate/support", - "version": "v10.47.0", + "version": "v10.48.4", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "a98f849a2a0f36fbcbec77d07cae680e240ccdc1" + "reference": "980d80017e859c8b1720892d952516e8c0b6708f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/a98f849a2a0f36fbcbec77d07cae680e240ccdc1", - "reference": "a98f849a2a0f36fbcbec77d07cae680e240ccdc1", + "url": "https://api.github.com/repos/illuminate/support/zipball/980d80017e859c8b1720892d952516e8c0b6708f", + "reference": "980d80017e859c8b1720892d952516e8c0b6708f", "shasum": "" }, "require": { @@ -497,20 +638,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-03-02T00:22:09+00:00" + "time": "2024-03-11T21:46:45+00:00" }, { "name": "laravel/installer", - "version": "v5.5.3", + "version": "v5.7.1", "source": { "type": "git", "url": "https://github.com/laravel/installer.git", - "reference": "0d4cd3b27037ee3f2d4c599f838c7ae93827f184" + "reference": "9aa23f46453076e026237a54ae7eb23455ab1921" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/installer/zipball/0d4cd3b27037ee3f2d4c599f838c7ae93827f184", - "reference": "0d4cd3b27037ee3f2d4c599f838c7ae93827f184", + "url": "https://api.github.com/repos/laravel/installer/zipball/9aa23f46453076e026237a54ae7eb23455ab1921", + "reference": "9aa23f46453076e026237a54ae7eb23455ab1921", "shasum": "" }, "require": { @@ -550,22 +691,22 @@ ], "support": { "issues": "https://github.com/laravel/installer/issues", - "source": "https://github.com/laravel/installer/tree/v5.5.3" + "source": "https://github.com/laravel/installer/tree/v5.7.1" }, - "time": "2024-03-05T15:26:46+00:00" + "time": "2024-04-02T14:11:43+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.16", + "version": "v0.1.17", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781" + "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/ca6872ab6aec3ab61db3a61f83a6caf764ec7781", - "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781", + "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5", + "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5", "shasum": "" }, "require": { @@ -607,9 +748,123 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.16" + "source": "https://github.com/laravel/prompts/tree/v0.1.17" }, - "time": "2024-02-21T19:25:27+00:00" + "time": "2024-03-13T16:05:43+00:00" + }, + { + "name": "mnapoli/silly", + "version": "1.9.0", + "source": { + "type": "git", + "url": "https://github.com/mnapoli/silly.git", + "reference": "fdb69ac9335b4c83f70baf433eae91e691901f1c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mnapoli/silly/zipball/fdb69ac9335b4c83f70baf433eae91e691901f1c", + "reference": "fdb69ac9335b4c83f70baf433eae91e691901f1c", + "shasum": "" + }, + "require": { + "php": ">=7.4", + "php-di/invoker": "~2.0", + "psr/container": "^1.0|^2.0", + "symfony/console": "~3.0|~4.0|~5.0|~6.0|~7.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.12", + "mnapoli/phpunit-easymock": "~1.0", + "phpunit/phpunit": "^6.4|^7|^8|^9|^10" + }, + "type": "library", + "autoload": { + "psr-4": { + "Silly\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Silly CLI micro-framework based on Symfony Console", + "keywords": [ + "PSR-11", + "cli", + "console", + "framework", + "micro-framework", + "silly" + ], + "support": { + "issues": "https://github.com/mnapoli/silly/issues", + "source": "https://github.com/mnapoli/silly/tree/1.9.0" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/mnapoli/silly", + "type": "tidelift" + } + ], + "time": "2024-01-18T15:47:39+00:00" + }, + { + "name": "nategood/httpful", + "version": "0.3.2", + "source": { + "type": "git", + "url": "https://github.com/nategood/httpful.git", + "reference": "0cded3ea97ba905600de9ceb9ef13f3ab681587c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nategood/httpful/zipball/0cded3ea97ba905600de9ceb9ef13f3ab681587c", + "reference": "0cded3ea97ba905600de9ceb9ef13f3ab681587c", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=7.2" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "type": "library", + "autoload": { + "psr-0": { + "Httpful": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nate Good", + "email": "me@nategood.com", + "homepage": "http://nategood.com" + } + ], + "description": "A Readable, Chainable, REST friendly, PHP HTTP Client", + "homepage": "http://github.com/nategood/httpful", + "keywords": [ + "api", + "curl", + "http", + "requests", + "rest", + "restful" + ], + "support": { + "issues": "https://github.com/nategood/httpful/issues", + "source": "https://github.com/nategood/httpful/tree/v0.3.2" + }, + "time": "2020-01-25T01:13:13+00:00" }, { "name": "nesbot/carbon", @@ -718,6 +973,117 @@ ], "time": "2024-01-25T10:35:09+00:00" }, + { + "name": "outrightvision/api-model", + "version": "v1.0.24", + "source": { + "type": "git", + "url": "https://github.com/OUTRIGHT-Vision/api-model.git", + "reference": "f781b494a485ff915f307c3364a20579466c67e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/OUTRIGHT-Vision/api-model/zipball/f781b494a485ff915f307c3364a20579466c67e0", + "reference": "f781b494a485ff915f307c3364a20579466c67e0", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^5.0|^6.0|^7.0|^8.0|^9.0|^10.0" + }, + "require-dev": { + "orchestra/testbench": "^8.5", + "php": "^8.2", + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/Support/helpers.php" + ], + "psr-4": { + "Tests\\": "tests/", + "OUTRIGHTVision\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Joaquin Marcher", + "email": "joaquin@marcher.com.uy" + } + ], + "description": "Generate Laravel-like Api Models", + "keywords": [ + "api", + "eloquent", + "laravel", + "models" + ], + "support": { + "issues": "https://github.com/OUTRIGHT-Vision/api-model/issues", + "source": "https://github.com/OUTRIGHT-Vision/api-model/tree/v1.0.24" + }, + "time": "2023-12-06T13:59:55+00:00" + }, + { + "name": "php-di/invoker", + "version": "2.3.4", + "source": { + "type": "git", + "url": "https://github.com/PHP-DI/Invoker.git", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "psr/container": "^1.0|^2.0" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Invoker\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Generic and extensible callable invoker", + "homepage": "https://github.com/PHP-DI/Invoker", + "keywords": [ + "callable", + "dependency", + "dependency-injection", + "injection", + "invoke", + "invoker" + ], + "support": { + "issues": "https://github.com/PHP-DI/Invoker/issues", + "source": "https://github.com/PHP-DI/Invoker/tree/2.3.4" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + } + ], + "time": "2023-09-08T09:24:21+00:00" + }, { "name": "psr/clock", "version": "1.0.0", @@ -872,16 +1238,16 @@ }, { "name": "symfony/console", - "version": "v7.0.4", + "version": "v7.0.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f" + "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/6b099f3306f7c9c2d2786ed736d0026b2903205f", - "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f", + "url": "https://api.github.com/repos/symfony/console/zipball/fde915cd8e7eb99b3d531d3d5c09531429c3f9e5", + "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5", "shasum": "" }, "require": { @@ -945,7 +1311,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.0.4" + "source": "https://github.com/symfony/console/tree/v7.0.6" }, "funding": [ { @@ -961,7 +1327,7 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:20+00:00" + "time": "2024-04-01T11:04:53+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1494,20 +1860,20 @@ }, { "name": "symfony/process", - "version": "v7.0.4", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9" + "reference": "710e27879e9be3395de2b98da3f52a946039f297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/0e7727191c3b71ebec6d529fa0e50a01ca5679e9", - "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.1" }, "type": "library", "autoload": { @@ -1535,7 +1901,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.0.4" + "source": "https://github.com/symfony/process/tree/v6.4.4" }, "funding": [ { @@ -1551,20 +1917,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:20+00:00" + "time": "2024-02-20T12:31:00+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e", + "reference": "11bbf19a0fb7b36345861e85c5768844c552906e", "shasum": "" }, "require": { @@ -1617,7 +1983,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.2" }, "funding": [ { @@ -1633,7 +1999,7 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2023-12-19T21:51:00+00:00" }, { "name": "symfony/string", @@ -1818,16 +2184,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "06450585bf65e978026bda220cdebca3f867fde7" + "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", - "reference": "06450585bf65e978026bda220cdebca3f867fde7", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/43810bdb2ddb5400e5c5e778e27b210a0ca83b6b", + "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b", "shasum": "" }, "require": { @@ -1876,7 +2242,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.2" }, "funding": [ { @@ -1892,7 +2258,147 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-01-23T14:51:35+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v6.4.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4", + "reference": "95bd2706a97fb875185b51ecaa6112ec184233d4", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v6.4.6" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-03-19T11:56:30+00:00" + }, + { + "name": "tightenco/collect", + "version": "v9.52.7", + "source": { + "type": "git", + "url": "https://github.com/tighten/collect.git", + "reference": "b15143cd11fe01a700fcc449df61adc64452fa6d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tighten/collect/zipball/b15143cd11fe01a700fcc449df61adc64452fa6d", + "reference": "b15143cd11fe01a700fcc449df61adc64452fa6d", + "shasum": "" + }, + "require": { + "php": "^8.0", + "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0" + }, + "require-dev": { + "mockery/mockery": "^1.0", + "nesbot/carbon": "^2.23.0", + "phpunit/phpunit": "^8.3" + }, + "type": "library", + "autoload": { + "files": [ + "src/Collect/Support/helpers.php", + "src/Collect/Support/alias.php" + ], + "psr-4": { + "Tightenco\\Collect\\": "src/Collect" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "Collect - Illuminate Collections as a separate package.", + "keywords": [ + "collection", + "laravel" + ], + "support": { + "issues": "https://github.com/tighten/collect/issues", + "source": "https://github.com/tighten/collect/tree/v9.52.7" + }, + "abandoned": "illuminate/collections", + "time": "2023-04-14T21:51:36+00:00" }, { "name": "voku/portable-ascii", diff --git a/.config/fish/conf.d/30-fzf.fish b/.config/fish/conf.d/30-fzf.fish index d614550..00f276d 100644 --- a/.config/fish/conf.d/30-fzf.fish +++ b/.config/fish/conf.d/30-fzf.fish @@ -16,4 +16,4 @@ set -gx FZF_DEFAULT_OPTS "\ # fzf.fish set -g fzf_preview_dir_cmd eza --all --color=always --sort=name --group-directories-first -set -g fzf_diff_highlighter delta --paging=never --width=20 +set -g fzf_diff_highlighter delta --paging=never --features=arctic-fox diff --git a/.config/fish/conf.d/30-gtk.fish b/.config/fish/conf.d/30-gtk.fish index b819bc8..e24bbbb 100644 --- a/.config/fish/conf.d/30-gtk.fish +++ b/.config/fish/conf.d/30-gtk.fish @@ -1,3 +1,3 @@ #!/usr/bin/env fish -set -gx GTK_THEME 'Catppuccin-Macchiato-Standard-Pink-dark:dark' +set -gx GTK_THEME Catppuccin-Macchiato-Standard-Pink-Dark diff --git a/.config/fish/conf.d/30-php.fish b/.config/fish/conf.d/30-php.fish index fe7178f..07cf29c 100644 --- a/.config/fish/conf.d/30-php.fish +++ b/.config/fish/conf.d/30-php.fish @@ -1,3 +1,7 @@ #!/usr/bin/env fish fish_add_path "$HOME/.config/composer/vendor/bin" + +abbr -a p --position command php +abbr -a pa --position command "php artisan" +abbr -a a --position command "php artisan" diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins deleted file mode 100644 index d864aa6..0000000 --- a/.config/fish/fish_plugins +++ /dev/null @@ -1,4 +0,0 @@ -jorgebucaran/fisher -catppuccin/fish -jorgebucaran/autopair.fish -PatrickF1/fzf.fish diff --git a/.config/fish/fishd.tmp.CLlvwt b/.config/fish/fishd.tmp.CLlvwt new file mode 100644 index 0000000..e69de29 diff --git a/.config/fish/fishd.tmp.t0EB5d b/.config/fish/fishd.tmp.t0EB5d new file mode 100644 index 0000000..e69de29 diff --git a/.config/git/hooks/prepare-commit-msg b/.config/git/hooks/prepare-commit-msg index c524815..7d3ef9a 100755 --- a/.config/git/hooks/prepare-commit-msg +++ b/.config/git/hooks/prepare-commit-msg @@ -4,8 +4,8 @@ set -l msg_file $argv[1] set -l commit_type $(string trim $argv[2]) set -l commit_sha $(string trim $argv[3]) -# Rebasing. -if test "$commit_type" = messageg +# Rebasing || cherry-picking. +if test "$commit_type" = messageg || test "$commit_type" = message exit 0 end diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index f4e2010..f03853f 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -3,7 +3,7 @@ ], "news": { - "NEWS.md": "2123" + "NEWS.md": "3314" }, "version": 3 } \ No newline at end of file diff --git a/.config/nvim/lua/plugins/nvim-lspconfig.lua b/.config/nvim/lua/plugins/nvim-lspconfig.lua index 1bf7b0f..99a7c53 100644 --- a/.config/nvim/lua/plugins/nvim-lspconfig.lua +++ b/.config/nvim/lua/plugins/nvim-lspconfig.lua @@ -3,7 +3,6 @@ return { "neovim/nvim-lspconfig", ---@class PluginLspOpts opts = { - --@type lspconfig.options servers = { -- data/conf sqlls = {}, @@ -74,17 +73,8 @@ return { }, -- php - intelephense = { + phpactor = { filetypes = { "php", "blade" }, - settings = { - intelephense = { - filetypes = { "php", "blade" }, - files = { - associations = { "*.php", "*.blade.php" }, - maxSize = 5000000, - }, - }, - }, }, -- shell diff --git a/.config/nvim/lua/plugins/vim-gutentags.lua b/.config/nvim/lua/plugins/vim-gutentags.lua new file mode 100644 index 0000000..233721f --- /dev/null +++ b/.config/nvim/lua/plugins/vim-gutentags.lua @@ -0,0 +1,6 @@ +return { + { + "ludovicchabant/vim-gutentags", + lazy = false, + }, +} diff --git a/.config/nvim/lua/plugins/vim-wakatime.lua b/.config/nvim/lua/plugins/vim-wakatime.lua new file mode 100644 index 0000000..83b5793 --- /dev/null +++ b/.config/nvim/lua/plugins/vim-wakatime.lua @@ -0,0 +1,3 @@ +return { + { "wakatime/vim-wakatime", lazy = false }, +} diff --git a/.config/nvim/lua/snippets/html.lua b/.config/nvim/lua/snippets/html.lua new file mode 100644 index 0000000..5a34b0d --- /dev/null +++ b/.config/nvim/lua/snippets/html.lua @@ -0,0 +1,29 @@ +local ls = require("luasnip") +local s = ls.snippet +local i = ls.insert_node +local fmt = require("luasnip.extras.fmt").fmt + +return { + s( + { trig = "sd!", desc = "Saudade page" }, + fmt( + [[ + +
+ + +