From 433c56f166da50fc0bc58f10fc938274c3758c3d Mon Sep 17 00:00:00 2001 From: tiago Date: Sun, 14 May 2023 18:32:46 +0100 Subject: [PATCH] mainly colorscheme related + added dunst --- .config/alacritty/alacritty.yml | 2 +- .../themes/catppuccin/catppuccin-frappe.yml | 80 +++++++++++++++++++ .../themes/catppuccin/catppuccin-latte.yml | 79 ++++++++++++++++++ .../catppuccin/catppuccin-macchiato.yml | 79 ++++++++++++++++++ .../themes/catppuccin/catppuccin-mocha.yml | 78 ++++++++++++++++++ .config/dunst/dunstrc | 16 ++++ .config/fish/config.fish | 4 +- .config/i3/config | 5 +- .config/nvim/after/plugin/colorscheme.lua | 33 ++++++-- .config/nvim/lua/tsousa/packer.lua | 2 +- .config/nvim/plugin/packer_compiled.lua | 10 +-- .config/polybar/config.ini | 2 +- 12 files changed, 370 insertions(+), 20 deletions(-) create mode 100644 .config/alacritty/themes/catppuccin/catppuccin-frappe.yml create mode 100644 .config/alacritty/themes/catppuccin/catppuccin-latte.yml create mode 100644 .config/alacritty/themes/catppuccin/catppuccin-macchiato.yml create mode 100644 .config/alacritty/themes/catppuccin/catppuccin-mocha.yml create mode 100644 .config/dunst/dunstrc diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 4b07064..eb1b42e 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -9,7 +9,7 @@ # All imports must either be absolute paths starting with `/`, or paths relative # to the user's home directory starting with `~/`. import: - - ~/.config/alacritty/catpuccin-frappe.yml + - ~/.config/alacritty/themes/catppuccin/catppuccin-macchiato.yml # Any items in the `env` entry below will be added as # environment variables. Some entries may override variables diff --git a/.config/alacritty/themes/catppuccin/catppuccin-frappe.yml b/.config/alacritty/themes/catppuccin/catppuccin-frappe.yml new file mode 100644 index 0000000..8bb3d65 --- /dev/null +++ b/.config/alacritty/themes/catppuccin/catppuccin-frappe.yml @@ -0,0 +1,80 @@ +colors: + # Default colors + primary: + background: "#303446" # base + foreground: "#C6D0F5" # text + # Bright and dim foreground colors + dim_foreground: "#C6D0F5" # text + bright_foreground: "#C6D0F5" # text + + # Cursor colors + cursor: + text: "#303446" # base + cursor: "#F2D5CF" # rosewater + vi_mode_cursor: + text: "#303446" # base + cursor: "#BABBF1" # lavender + + # Search colors + search: + matches: + foreground: "#303446" # base + background: "#A5ADCE" # subtext0 + focused_match: + foreground: "#303446" # base + background: "#A6D189" # green + footer_bar: + foreground: "#303446" # base + background: "#A5ADCE" # subtext0 + + # Keyboard regex hints + hints: + start: + foreground: "#303446" # base + background: "#E5C890" # yellow + end: + foreground: "#303446" # base + background: "#A5ADCE" # subtext0 + + # Selection colors + selection: + text: "#303446" # base + background: "#F2D5CF" # rosewater + + # Normal colors + normal: + black: "#51576D" # surface1 + red: "#E78284" # red + green: "#A6D189" # green + yellow: "#E5C890" # yellow + blue: "#8CAAEE" # blue + magenta: "#F4B8E4" # pink + cyan: "#81C8BE" # teal + white: "#B5BFE2" # subtext1 + + # Bright colors + bright: + black: "#626880" # surface2 + red: "#E78284" # red + green: "#A6D189" # green + yellow: "#E5C890" # yellow + blue: "#8CAAEE" # blue + magenta: "#F4B8E4" # pink + cyan: "#81C8BE" # teal + white: "#A5ADCE" # subtext0 + + # Dim colors + dim: + black: "#51576D" # surface1 + red: "#E78284" # red + green: "#A6D189" # green + yellow: "#E5C890" # yellow + blue: "#8CAAEE" # blue + magenta: "#F4B8E4" # pink + cyan: "#81C8BE" # teal + white: "#B5BFE2" # subtext1 + + indexed_colors: + - { index: 16, color: "#EF9F76" } + - { index: 17, color: "#F2D5CF" } + diff --git a/.config/alacritty/themes/catppuccin/catppuccin-latte.yml b/.config/alacritty/themes/catppuccin/catppuccin-latte.yml new file mode 100644 index 0000000..b3be03d --- /dev/null +++ b/.config/alacritty/themes/catppuccin/catppuccin-latte.yml @@ -0,0 +1,79 @@ +colors: + # Default colors + primary: + background: "#EFF1F5" # base + foreground: "#4C4F69" # text + # Bright and dim foreground colors + dim_foreground: "#4C4F69" # text + bright_foreground: "#4C4F69" # text + + # Cursor colors + cursor: + text: "#EFF1F5" # base + cursor: "#DC8A78" # rosewater + vi_mode_cursor: + text: "#EFF1F5" # base + cursor: "#7287FD" # lavender + + # Search colors + search: + matches: + foreground: "#EFF1F5" # base + background: "#6C6F85" # subtext0 + focused_match: + foreground: "#EFF1F5" # base + background: "#40A02B" # green + footer_bar: + foreground: "#EFF1F5" # base + background: "#6C6F85" # subtext0 + + # Keyboard regex hints + hints: + start: + foreground: "#EFF1F5" # base + background: "#DF8E1D" # yellow + end: + foreground: "#EFF1F5" # base + background: "#6C6F85" # subtext0 + + # Selection colors + selection: + text: "#EFF1F5" # base + background: "#DC8A78" # rosewater + + # Normal colors + normal: + black: "#5C5F77" # subtext1 + red: "#D20F39" # red + green: "#40A02B" # green + yellow: "#DF8E1D" # yellow + blue: "#1E66F5" # blue + magenta: "#EA76CB" # pink + cyan: "#179299" # teal + white: "#ACB0BE" # surface2 + + # Bright colors + bright: + black: "#6C6F85" # subtext0 + red: "#D20F39" # red + green: "#40A02B" # green + yellow: "#DF8E1D" # yellow + blue: "#1E66F5" # blue + magenta: "#EA76CB" # pink + cyan: "#179299" # teal + white: "#BCC0CC" # surface1 + + # Dim colors + dim: + black: "#5C5F77" # subtext1 + red: "#D20F39" # red + green: "#40A02B" # green + yellow: "#DF8E1D" # yellow + blue: "#1E66F5" # blue + magenta: "#EA76CB" # pink + cyan: "#179299" # teal + white: "#ACB0BE" # surface2 + + indexed_colors: + - { index: 16, color: "#FE640B" } + - { index: 17, color: "#DC8A78" } diff --git a/.config/alacritty/themes/catppuccin/catppuccin-macchiato.yml b/.config/alacritty/themes/catppuccin/catppuccin-macchiato.yml new file mode 100644 index 0000000..183b3c8 --- /dev/null +++ b/.config/alacritty/themes/catppuccin/catppuccin-macchiato.yml @@ -0,0 +1,79 @@ +colors: + # Default colors + primary: + background: "#24273A" # base + foreground: "#CAD3F5" # text + # Bright and dim foreground colors + dim_foreground: "#CAD3F5" # text + bright_foreground: "#CAD3F5" # text + + # Cursor colors + cursor: + text: "#24273A" # base + cursor: "#F4DBD6" # rosewater + vi_mode_cursor: + text: "#24273A" # base + cursor: "#B7BDF8" # lavender + + # Search colors + search: + matches: + foreground: "#24273A" # base + background: "#A5ADCB" # subtext0 + focused_match: + foreground: "#24273A" # base + background: "#A6DA95" # green + footer_bar: + foreground: "#24273A" # base + background: "#A5ADCB" # subtext0 + + # Keyboard regex hints + hints: + start: + foreground: "#24273A" # base + background: "#EED49F" # yellow + end: + foreground: "#24273A" # base + background: "#A5ADCB" # subtext0 + + # Selection colors + selection: + text: "#24273A" # base + background: "#F4DBD6" # rosewater + + # Normal colors + normal: + black: "#494D64" # surface1 + red: "#ED8796" # red + green: "#A6DA95" # green + yellow: "#EED49F" # yellow + blue: "#8AADF4" # blue + magenta: "#F5BDE6" # pink + cyan: "#8BD5CA" # teal + white: "#B8C0E0" # subtext1 + + # Bright colors + bright: + black: "#5B6078" # surface2 + red: "#ED8796" # red + green: "#A6DA95" # green + yellow: "#EED49F" # yellow + blue: "#8AADF4" # blue + magenta: "#F5BDE6" # pink + cyan: "#8BD5CA" # teal + white: "#A5ADCB" # subtext0 + + # Dim colors + dim: + black: "#494D64" # surface1 + red: "#ED8796" # red + green: "#A6DA95" # green + yellow: "#EED49F" # yellow + blue: "#8AADF4" # blue + magenta: "#F5BDE6" # pink + cyan: "#8BD5CA" # teal + white: "#B8C0E0" # subtext1 + + indexed_colors: + - { index: 16, color: "#F5A97F" } + - { index: 17, color: "#F4DBD6" } diff --git a/.config/alacritty/themes/catppuccin/catppuccin-mocha.yml b/.config/alacritty/themes/catppuccin/catppuccin-mocha.yml new file mode 100644 index 0000000..e787352 --- /dev/null +++ b/.config/alacritty/themes/catppuccin/catppuccin-mocha.yml @@ -0,0 +1,78 @@ +colors: + primary: + background: "#1E1E2E" # base + foreground: "#CDD6F4" # text + # Bright and dim foreground colors + dim_foreground: "#CDD6F4" # text + bright_foreground: "#CDD6F4" # text + + # Cursor colors + cursor: + text: "#1E1E2E" # base + cursor: "#F5E0DC" # rosewater + vi_mode_cursor: + text: "#1E1E2E" # base + cursor: "#B4BEFE" # lavender + + # Search colors + search: + matches: + foreground: "#1E1E2E" # base + background: "#A6ADC8" # subtext0 + focused_match: + foreground: "#1E1E2E" # base + background: "#A6E3A1" # green + footer_bar: + foreground: "#1E1E2E" # base + background: "#A6ADC8" # subtext0 + + # Keyboard regex hints + hints: + start: + foreground: "#1E1E2E" # base + background: "#F9E2AF" # yellow + end: + foreground: "#1E1E2E" # base + background: "#A6ADC8" # subtext0 + + # Selection colors + selection: + text: "#1E1E2E" # base + background: "#F5E0DC" # rosewater + + # Normal colors + normal: + black: "#45475A" # surface1 + red: "#F38BA8" # red + green: "#A6E3A1" # green + yellow: "#F9E2AF" # yellow + blue: "#89B4FA" # blue + magenta: "#F5C2E7" # pink + cyan: "#94E2D5" # teal + white: "#BAC2DE" # subtext1 + + # Bright colors + bright: + black: "#585B70" # surface2 + red: "#F38BA8" # red + green: "#A6E3A1" # green + yellow: "#F9E2AF" # yellow + blue: "#89B4FA" # blue + magenta: "#F5C2E7" # pink + cyan: "#94E2D5" # teal + white: "#A6ADC8" # subtext0 + + # Dim colors + dim: + black: "#45475A" # surface1 + red: "#F38BA8" # red + green: "#A6E3A1" # green + yellow: "#F9E2AF" # yellow + blue: "#89B4FA" # blue + magenta: "#F5C2E7" # pink + cyan: "#94E2D5" # teal + white: "#BAC2DE" # subtext1 + + indexed_colors: + - { index: 16, color: "#FAB387" } + - { index: 17, color: "#F5E0DC" } diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc new file mode 100644 index 0000000..2f96f28 --- /dev/null +++ b/.config/dunst/dunstrc @@ -0,0 +1,16 @@ +[global] +frame_color = "#8AADF4" +separator_color= frame + +[urgency_low] +background = "#24273A" +foreground = "#CAD3F5" + +[urgency_normal] +background = "#24273A" +foreground = "#CAD3F5" + +[urgency_critical] +background = "#24273A" +foreground = "#CAD3F5" +frame_color = "#F5A97F" diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 6cc796f..5fef7f7 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -16,4 +16,6 @@ export MANPAGER="sh -c 'col -bx | bat -l man -p'" set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/tsousa/.ghcup/bin $PATH # ghcup-env fish_add_path $HOME/.local/share/nvim/mason/bin/ fish_add_path $HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin -#neofetch + +starship init fish | source + diff --git a/.config/i3/config b/.config/i3/config index ab6eaff..a39f05b 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -35,7 +35,7 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork exec --no-startup-id nm-applet # Use pactl to adjust volume in PulseAudio. -set $refresh_i3status killall -SIGUSR1 i3status +#set $refresh_i3status killall -SIGUSR1 i3status bindsym XF86AudioRaiseVolume exec --no-startup-id pamixer -i 5 && $refresh_i3status bindsym XF86AudioLowerVolume exec --no-startup-id pamixer -d 5 && $refresh_i3status bindsym XF86AudioMute exec --no-startup-id pamixer set --toggle-mute && $refresh_i3status @@ -203,7 +203,6 @@ bindsym $mod+r mode "resize" gaps inner 10 gaps top 40 - mode "Power menu: [e]xit i3 | [S-s]hutdown | [s]uspend | [r]eboot" { bindsym $mod+e exec --no-startup-id i3-msg exit bindsym $mod+Shift+s exec shutdown -h now @@ -216,7 +215,7 @@ mode "Power menu: [e]xit i3 | [S-s]hutdown | [s]uspend | [r]eboot" { bindsym $mod+Shift+e mode "Power menu: [e]xit i3 | [S-s]hutdown | [s]uspend | [r]eboot" exec --no-startup-id nitrogen --restore -exec --no-startup-id i3-msg 'workspace 2; exec firefox; exec discord; workspace 1; exec alacritty' +exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec alacritty' exec --no-startup-id picom -b exec_always --no-startup-id ~/.config/polybar/launch.sh diff --git a/.config/nvim/after/plugin/colorscheme.lua b/.config/nvim/after/plugin/colorscheme.lua index d8c5651..4614ad6 100644 --- a/.config/nvim/after/plugin/colorscheme.lua +++ b/.config/nvim/after/plugin/colorscheme.lua @@ -1,5 +1,5 @@ require("catppuccin").setup({ - flavour = "frappe", -- latte, frappe, macchiato, mocha + flavour = "macchiato", -- latte, frappe, macchiato, mocha transparent_background = false, term_colors = false, @@ -26,12 +26,29 @@ require("catppuccin").setup({ }, }) -function ColorMyPencils(color) - color = color or "catppuccin" +require("gruvbox").setup({ + undercurl = true, + underline = true, + bold = true, + italic = { + strings = false, + comments = true, + operators = false, + folds = true, + }, + strikethrough = true, + invert_selection = false, + invert_signs = false, + invert_tabline = false, + invert_intend_guides = false, + inverse = true, -- invert background for search, diffs, statuslines and errors + contrast = "", -- can be "hard", "soft" or empty string + palette_overrides = {}, + overrides = {}, + dim_inactive = false, + transparent_mode = false, +}) - vim.cmd.colorscheme(color) - -- vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - -- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) -end +vim.o.background = "dark" +vim.cmd.colorscheme("catppuccin") -ColorMyPencils() diff --git a/.config/nvim/lua/tsousa/packer.lua b/.config/nvim/lua/tsousa/packer.lua index 5ba4ce3..075d5bf 100644 --- a/.config/nvim/lua/tsousa/packer.lua +++ b/.config/nvim/lua/tsousa/packer.lua @@ -47,5 +47,5 @@ return require('packer').startup(function(use) -- Colorscheme section use("catppuccin/nvim") - use("folke/tokyonight.nvim") + use("ellisonleao/gruvbox.nvim") end) diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index eec3eb5..5e86f77 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -109,6 +109,11 @@ _G.packer_plugins = { path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/fidget.nvim", url = "https://github.com/j-hui/fidget.nvim" }, + ["gruvbox.nvim"] = { + loaded = true, + path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/gruvbox.nvim", + url = "https://github.com/ellisonleao/gruvbox.nvim" + }, harpoon = { loaded = true, path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/harpoon", @@ -199,11 +204,6 @@ _G.packer_plugins = { path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, - ["tokyonight.nvim"] = { - loaded = true, - path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/tokyonight.nvim", - url = "https://github.com/folke/tokyonight.nvim" - }, undotree = { loaded = true, path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/undotree", diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index d59ba60..c53a3b1 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -17,7 +17,7 @@ ;========================================================== include-file = modules.ini -include-file = $HOME/.config/polybar/themes/frappe.ini +include-file = $HOME/.config/polybar/themes/macchiato.ini [settings] screenchange-reload = true