From fa5845b6ab285285d09ae8515ec65669d60d0bcc Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Mon, 27 May 2024 09:46:47 +0930 Subject: [PATCH] feat: change to gruvbox theme --- .config/alacritty/alacritty.toml | 2 +- .config/alacritty/themes/gruvbox_dark.toml | 30 +++++ .config/aliasrc | 4 + .config/nvim/lua/tovi/plugins/colorscheme.lua | 115 ++++++++++-------- .config/nvim/lua/tovi/plugins/lualine.lua | 2 +- .tmux.conf | 17 +-- .zshrc | 2 +- 7 files changed, 109 insertions(+), 63 deletions(-) create mode 100644 .config/alacritty/themes/gruvbox_dark.toml diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index e902dcc..da30d14 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,5 +1,5 @@ import = [ - "~/.config/alacritty/themes/catppuccin-mocha.toml" + "~/.config/alacritty/themes/gruvbox_dark.toml" ] [env] diff --git a/.config/alacritty/themes/gruvbox_dark.toml b/.config/alacritty/themes/gruvbox_dark.toml new file mode 100644 index 0000000..d2845cd --- /dev/null +++ b/.config/alacritty/themes/gruvbox_dark.toml @@ -0,0 +1,30 @@ +# Colors (Gruvbox dark) + +# Default colors +[colors.primary] +# hard contrast background = = '#1d2021' +background = '#282828' +# soft contrast background = = '#32302f' +foreground = '#ebdbb2' + +# Normal colors +[colors.normal] +black = '#282828' +red = '#cc241d' +green = '#98971a' +yellow = '#d79921' +blue = '#458588' +magenta = '#b16286' +cyan = '#689d6a' +white = '#a89984' + +# Bright colors +[colors.bright] +black = '#928374' +red = '#fb4934' +green = '#b8bb26' +yellow = '#fabd2f' +blue = '#83a598' +magenta = '#d3869b' +cyan = '#8ec07c' +white = '#ebdbb2' diff --git a/.config/aliasrc b/.config/aliasrc index 0f000a8..a54aeab 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -64,3 +64,7 @@ fi alias jack-artisan="dce app-fpm ./artisan" alias jack-paratest="dce app-fpm ./test" alias jack-phpunit="dce app-fpm ./vendor/bin/phpunit" + +alias jack-subscription-artisan="dce subscription-fpm ./artisan" +alias jack-subscription-paratest="dce subscription-fpm ./test" +alias jack-subscription-phpunit="dce subscription-fpm ./vendor/bin/phpunit" diff --git a/.config/nvim/lua/tovi/plugins/colorscheme.lua b/.config/nvim/lua/tovi/plugins/colorscheme.lua index d460ed0..9d44f1a 100644 --- a/.config/nvim/lua/tovi/plugins/colorscheme.lua +++ b/.config/nvim/lua/tovi/plugins/colorscheme.lua @@ -1,56 +1,65 @@ +-- return { +-- "catppuccin/nvim", +-- name = "catppuccin", +-- priority = 1000, +-- config = function () +-- require("catppuccin").setup({ +-- flavour = "mocha", -- latte, frappe, macchiato, mocha +-- background = { -- :h background +-- light = "latte", +-- dark = "mocha", +-- }, +-- transparent_background = false, -- disables setting the background color. +-- show_end_of_buffer = false, -- shows the '~' characters after the end of buffers +-- term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`) +-- dim_inactive = { +-- enabled = false, -- dims the background color of inactive window +-- shade = "dark", +-- percentage = 0.15, -- percentage of the shade to apply to the inactive window +-- }, +-- no_italic = false, -- Force no italic +-- no_bold = false, -- Force no bold +-- no_underline = false, -- Force no underline +-- styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): +-- comments = { "italic" }, -- Change the style of comments +-- conditionals = { "italic" }, +-- loops = {}, +-- functions = {}, +-- keywords = {}, +-- strings = {}, +-- variables = {}, +-- numbers = {}, +-- booleans = {}, +-- properties = {}, +-- types = {}, +-- operators = {}, +-- -- miscs = {}, -- Uncomment to turn off hard-coded styles +-- }, +-- color_overrides = {}, +-- custom_highlights = {}, +-- default_integrations = true, +-- integrations = { +-- cmp = true, +-- gitsigns = true, +-- nvimtree = true, +-- treesitter = true, +-- notify = false, +-- mini = { +-- enabled = true, +-- indentscope_color = "", +-- }, +-- }, +-- }) +-- +-- vim.cmd("colorscheme catppuccin") +-- end +-- } + return { - "catppuccin/nvim", - name = "catppuccin", - priority = 1000, + "ellisonleao/gruvbox.nvim", + priority = 1000 , config = function () - require("catppuccin").setup({ - flavour = "mocha", -- latte, frappe, macchiato, mocha - background = { -- :h background - light = "latte", - dark = "mocha", - }, - transparent_background = false, -- disables setting the background color. - show_end_of_buffer = false, -- shows the '~' characters after the end of buffers - term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`) - dim_inactive = { - enabled = false, -- dims the background color of inactive window - shade = "dark", - percentage = 0.15, -- percentage of the shade to apply to the inactive window - }, - no_italic = false, -- Force no italic - no_bold = false, -- Force no bold - no_underline = false, -- Force no underline - styles = { -- Handles the styles of general hi groups (see `:h highlight-args`): - comments = { "italic" }, -- Change the style of comments - conditionals = { "italic" }, - loops = {}, - functions = {}, - keywords = {}, - strings = {}, - variables = {}, - numbers = {}, - booleans = {}, - properties = {}, - types = {}, - operators = {}, - -- miscs = {}, -- Uncomment to turn off hard-coded styles - }, - color_overrides = {}, - custom_highlights = {}, - default_integrations = true, - integrations = { - cmp = true, - gitsigns = true, - nvimtree = true, - treesitter = true, - notify = false, - mini = { - enabled = true, - indentscope_color = "", - }, - }, - }) - - vim.cmd("colorscheme catppuccin") - end + require("gruvbox").setup() + vim.cmd("colorscheme gruvbox") + end, } diff --git a/.config/nvim/lua/tovi/plugins/lualine.lua b/.config/nvim/lua/tovi/plugins/lualine.lua index 53c62aa..6e990a9 100644 --- a/.config/nvim/lua/tovi/plugins/lualine.lua +++ b/.config/nvim/lua/tovi/plugins/lualine.lua @@ -7,7 +7,7 @@ return { lualine.setup({ options = { - theme = 'catppuccin', + theme = 'gruvbox', component_separators = { left = '', right = '' }, section_separators = { left = '', right = '' }, }, diff --git a/.tmux.conf b/.tmux.conf index c3e1dde..050ea9a 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -65,13 +65,16 @@ bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer" set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'catppuccin/tmux' - -set -g @catppuccin_flavour 'mocha' - -set -g @catppuccin_status_left_separator "" -set -g @catppuccin_window_middle_separator " " -set -g @catppuccin_status_modules_right "application session directory date_time" +set -g @plugin 'egel/tmux-gruvbox' +set -g @tmux-gruvbox 'dark' # or 'light' + +# set -g @plugin 'catppuccin/tmux' +# +# set -g @catppuccin_flavour 'mocha' +# +# set -g @catppuccin_status_left_separator "" +# set -g @catppuccin_window_middle_separator " " +# set -g @catppuccin_status_modules_right "application session directory date_time" # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run '~/.tmux/plugins/tpm/tpm' diff --git a/.zshrc b/.zshrc index 33ab0dc..faf8c06 100644 --- a/.zshrc +++ b/.zshrc @@ -92,7 +92,7 @@ export FNM_NODE_DIST_MIRROR="https://nodejs.org/dist" export FNM_ARCH="x64" rehash -export PHPCS_STANDARD=~/.config/phpcs.xml +# export PHPCS_STANDARD=~/.config/phpcs.xml if [[ $(uname) == 'Darwin' ]]; then export HOMEBREW_NO_AUTO_UPDATE=1