Merge branch 'master' of git.tovijaeschke.xyz:tovi/dotfiles

.config/aliasrc

@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# gitup='git remote | xargs -L1 git push --all' \
 alias \
     q='exit' \
     ls="ls --color=auto" \
@@ -9,7 +11,6 @@ alias \
     grep='grep --color=auto' \
     p='sudo pacman' \
     extip='curl -s www.icanhazip.com' \
-    gitup='git remote | xargs -L1 git push --all' \
     gco='git checkout' \
     gbls='git --no-pager branch -a' \
     vv='nvim ~/.config/nvim/init.lua' \
@@ -25,11 +26,10 @@ alias \
     lf="lfcd" \
     dcu='docker compose up' \
     dce='docker compose exec' \
-    dcr='docker compose run' \
     dps="docker ps" \
     ds="docker stop" \
-    paratest='docker compose exec fpm ./test' \
-    phpunit='docker compose exec fpm ./vendor/bin/phpunit' \
+    dce-test='docker compose exec fpm ./artisan test' \
+    dc-phpunit='docker compose exec fpm ./vendor/bin/phpunit' \
     dm='mysql -h localhost -P 33061 --protocol=tcp -u root -psecret' \
     staging-mysql='mysql --host tf-codium-staging.ch66levpagqo.ap-southeast-2.rds.amazonaws.com --user=root --password=r43r34rg' \
     mailhog='docker run -d --restart unless-stopped -p 1025:1025 -p 8025:8025 mailhog/mailhog' \
@@ -39,12 +39,13 @@ alias \
     t12='docker run -it -v $(pwd):/workpace -v /root/.ssh:/root/.ssh:ro -v ~/.aws:/root/.aws -w /workpace hashicorp/terraform:0.12.27 ' \
     ducks='du -cks * | sort -rn | head' \
     fn="find . -name" \
-    artisan="docker-compose exec fpm php artisan" \
-    tinker="docker-compose exec fpm php artisan tinker" \
-    phpunit="docker-compose exec fpm ./vendor/bin/phpunit" \
+    artisan="docker compose exec fpm php artisan" \
+    tinker="docker compose exec fpm php artisan tinker" \
+    phpunit="docker compose exec fpm ./vendor/bin/phpunit" \
+    paratest="docker compose exec fpm ./test" \
     jsonlint="python -m json.tool" \
-    migseed="docker-compose exec fpm php artisan migrate --seed" \
-    dsa="docker kill $(docker ps -q)"
+    fresh="docker compose exec fpm php artisan migrate:fresh --seed" \
+    shrug="echo '¯\\_(ツ)_/¯' | xclip -selection clipboard && echo 'Copied ASCII shrug to clipboard'" \
 
 alias \
     c="xclip -selection clipboard" \
@@ -56,4 +57,5 @@ if [[ $(uname) == 'Darwin' ]]; then
         v="pbpaste"
 fi
 
-alias refresh-strng='dce server sh -c "./based -migrate-fresh && ./based -seed && ./based -sync-stripe-products"'
+alias jack-paratest="dce app-fpm ./test"
+alias jack-phpunit="dce app-fpm ./vendor/bin/phpunit"

.config/nvim/init.lua

@@ -1,3 +1,4 @@
 
 require('tovi.core')
 require('tovi.lazy')
+require('settings.theme')

.config/nvim/lazy-lock.json

@@ -1,56 +0,0 @@
-{
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
-  "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" },
-  "cloak.nvim": { "branch": "main", "commit": "9abe4e986e924fc54a972c1b0ff52b65a0622624" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "192a6d2ddace343f1840a8f72efe2315bd392243" },
-  "copilot.vim": { "branch": "release", "commit": "4d32b064fedbdbf8f3fa83afa1b19ebafd3a035c" },
-  "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" },
-  "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
-  "fugitive-gitlab.vim": { "branch": "master", "commit": "55fed481c0309b3405dd3d72921d687bf36873a8" },
-  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
-  "go.nvim": { "branch": "master", "commit": "d748e79011437d5b080006b896b3c296656641d7" },
-  "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" },
-  "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
-  "laravel.nvim": { "branch": "feature/discovery-check-improvements", "commit": "139a273fec5bb9b9a1c651f523deb3c03e2911c9" },
-  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
-  "lazygit.nvim": { "branch": "main", "commit": "10a5f30536dc2d4abe36d410d83149272ea457fa" },
-  "leap.nvim": { "branch": "main", "commit": "b41f48643b483bb0881c0f7804f6f0be7bb95155" },
-  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
-  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
-  "mini.notify": { "branch": "main", "commit": "9e5005379fa244eb6ebd622bfe21de9bf671f3b3" },
-  "minintro.nvim": { "branch": "master", "commit": "b7fa58cc549e8d2b362a217a7620d9aedc47d47e" },
-  "neotest": { "branch": "master", "commit": "f6048f32be831907fb15018af2688ff6633704fc" },
-  "neotest-go": { "branch": "main", "commit": "6a2f996d89fe4631942e035b1c114544ee045043" },
-  "neotest-phpunit": { "branch": "main", "commit": "e2dfa3280d2a33495a3f710bc364d2cfd1f40c83" },
-  "nightfox": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" },
-  "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
-  "nvim-lint": { "branch": "master", "commit": "85fe14d080d902dcc566461f0205495d0c153372" },
-  "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" },
-  "nvim-scissors": { "branch": "main", "commit": "08f784f2f84ff61167856a05aabd4de801c4d582" },
-  "nvim-treesitter": { "branch": "master", "commit": "6e2b56cbe75ddf18e6efecee44bc3936d70b0b3e" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
-  "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" },
-  "oil.nvim": { "branch": "master", "commit": "132b4ea0740c417b9d717411cab4cf187e1fd095" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
-  "retrospect.nvim": { "branch": "main", "commit": "1efdc6639c5ec556542c4d436e8e3c3ec13243f7" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
-  "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
-  "undotree": { "branch": "master", "commit": "9dbbf3b7d19dda0d22ceca461818e4739ad8154d" },
-  "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
-  "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" },
-  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }
-}

.config/nvim/lua/settings/theme.lua

@@ -0,0 +1,5 @@
+-- Themery block
+-- This block will be replaced by Themery.
+vim.cmd("colorscheme carbonfox")
+vim.g.theme_id = 2
+-- end themery block

.config/nvim/lua/tovi/plugins/colorscheme.lua

@@ -1,28 +1,100 @@
--- return {
---     "bluz71/vim-nightfly-colors",
---     name = "nightfly",
---     lazy = false,
---     priority = 1000,
---     config = function ()
---         vim.cmd([[ colorscheme nightfly ]])
---     end
--- }
-
 return {
-    "EdenEast/nightfox.nvim",
-    name = "nightfox",
-    lazy = false,
-    priority = 1000,
-    config = function ()
-        require('nightfox').setup({
-            options = {
-                styles = {
-                    comments = "italic",
-                    keywords = "bold",
-                    types = "italic,bold",
+    {
+        "EdenEast/nightfox.nvim",
+        name = "nightfox",
+        lazy = false,
+        priority = 1000,
+        config = function ()
+            require('nightfox').setup({
+                options = {
+                    styles = {
+                        comments = "italic",
+                        keywords = "bold",
+                        types = "italic,bold",
+                    }
                 }
-            }
-        })
-        vim.cmd([[ colorscheme carbonfox ]])
-    end
+            })
+            -- vim.cmd([[ colorscheme carbonfox ]])
+        end
+    },
+    {
+        "bluz71/vim-nightfly-colors",
+        name = "nightfly",
+        lazy = false,
+        priority = 1000,
+        config = function ()
+            -- vim.cmd([[ colorscheme nightfly ]])
+        end
+    },
+    {
+        "morhetz/gruvbox",
+        name = "gruvbox",
+        lazy = false,
+        priority = 1000,
+        config = function ()
+            -- vim.cmd([[ colorscheme gruvbox ]])
+        end
+    },
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        priority = 1000
+    },
+    {
+        "rebelot/kanagawa.nvim",
+        name = "kanagawa",
+        priority = 1000,
+        config = function ()
+            require('kanagawa').setup({
+                compile = false,             -- enable compiling the colorscheme
+                undercurl = true,            -- enable undercurls
+                commentStyle = { italic = true },
+                functionStyle = {},
+                keywordStyle = { italic = true},
+                statementStyle = { bold = true },
+                typeStyle = {},
+                transparent = false,         -- do not set background color
+                dimInactive = false,         -- dim inactive window `:h hl-NormalNC`
+                terminalColors = true,       -- define vim.g.terminal_color_{0,17}
+                colors = {                   -- add/modify theme and palette colors
+                    palette = {},
+                    theme = { wave = {}, lotus = {}, dragon = {}, all = {} },
+                },
+                overrides = function(colors) -- add/modify highlights
+                    return {}
+                end,
+                theme = "wave",              -- Load "wave" theme when 'background' option is not set
+                background = {               -- map the value of 'background' option to a theme
+                    dark = "dragon",           -- try "dragon" !
+                    light = "lotus"
+                },
+            })
+        end
+    },
+    {
+        "rose-pine/neovim",
+        as = "rose-pine"
+    },
+    {
+      "neanias/everforest-nvim",
+      version = false,
+      lazy = false,
+      priority = 1000, -- make sure to load this before all the other start plugins
+      -- Optional; default configuration will be used if setup isn't called.
+      config = function()
+        require("everforest").setup({
+                background = "hard",
+                transparent_background_level = 0,
+                italics = true,
+                disable_italic_comments = false,
+                on_highlights = function(hl, _)
+                    hl["@symbol"] = { link = "@field" }
+                end,
+            })
+      end,
+    },
+    {
+        "olimorris/onedarkpro.nvim",
+        priority = 1000, -- Ensure it loads first
+    }
 }

.config/nvim/lua/tovi/plugins/themery.lua

@@ -0,0 +1,22 @@
+return {
+    'zaldih/themery.nvim',
+    config = function ()
+        require("themery").setup({
+            themes = {
+                "nightfox",
+                "carbonfox",
+                "nightfly",
+                "gruvbox",
+                "catppuccin",
+                "kanagawa",
+                "rose-pine",
+                "everforest",
+                "onedark",
+                "onedark_dark",
+                "onedark_vivid",
+            },
+            themeConfigFile = "~/.config/nvim/lua/settings/theme.lua", -- Described below
+            livePreview = true, -- Apply theme while browsing. Default to true.
+        })
+    end
+}