diff --git a/.config/btop/btop.conf b/.config/btop/btop.conf index 2b11272..5f60a7f 100644 --- a/.config/btop/btop.conf +++ b/.config/btop/btop.conf @@ -202,7 +202,7 @@ net_download = 100 net_upload = 100 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. -net_auto = False +net_auto = True #* Sync the auto scaling for download and upload to whichever currently has the highest scale. net_sync = True diff --git a/.config/btop/themes/catppuccin.theme b/.config/btop/themes/catppuccin.theme index 82ac1d0..86819d2 100644 --- a/.config/btop/themes/catppuccin.theme +++ b/.config/btop/themes/catppuccin.theme @@ -1,83 +1,83 @@ # Main background, empty for terminal default, need to be empty if you want transparent background -theme[main_bg]="#eff1f5" +theme[main_bg]="#24273A" # Main text color -theme[main_fg]="#4c4f69" +theme[main_fg]="#CAD3F5" # Title color for boxes -theme[title]="#4c4f69" +theme[title]="#CAD3F5" # Highlight color for keyboard shortcuts -theme[hi_fg]="#1e66f5" +theme[hi_fg]="#8AADF4" # Background color of selected item in processes box -theme[selected_bg]="#bcc0cc" +theme[selected_bg]="#494D64" # Foreground color of selected item in processes box -theme[selected_fg]="#1e66f5" +theme[selected_fg]="#8AADF4" # Color of inactive/disabled text -theme[inactive_fg]="#8c8fa1" +theme[inactive_fg]="#8087A2" # Color of text appearing on top of graphs, i.e uptime and current network graph scaling -theme[graph_text]="#dc8a78" +theme[graph_text]="#F4DBD6" # Background color of the percentage meters -theme[meter_bg]="#bcc0cc" +theme[meter_bg]="#494D64" # Misc colors for processes box including mini cpu graphs, details memory graph and details status text -theme[proc_misc]="#dc8a78" +theme[proc_misc]="#F4DBD6" # CPU, Memory, Network, Proc box outline colors -theme[cpu_box]="#8839ef" #Mauve -theme[mem_box]="#40a02b" #Green -theme[net_box]="#e64553" #Maroon -theme[proc_box]="#1e66f5" #Blue +theme[cpu_box]="#c6a0f6" #Mauve +theme[mem_box]="#a6da95" #Green +theme[net_box]="#ee99a0" #Maroon +theme[proc_box]="#8aadf4" #Blue # Box divider line and small boxes line color -theme[div_line]="#9ca0b0" +theme[div_line]="#6E738D" # Temperature graph color (Green -> Yellow -> Red) -theme[temp_start]="#40a02b" -theme[temp_mid]="#df8e1d" -theme[temp_end]="#d20f39" +theme[temp_start]="#a6da95" +theme[temp_mid]="#eed49f" +theme[temp_end]="#ed8796" # CPU graph colors (Teal -> Lavender) -theme[cpu_start]="#179299" -theme[cpu_mid]="#209fb5" -theme[cpu_end]="#7287fd" +theme[cpu_start]="#8bd5ca" +theme[cpu_mid]="#7dc4e4" +theme[cpu_end]="#b7bdf8" # Mem/Disk free meter (Mauve -> Lavender -> Blue) -theme[free_start]="#8839ef" -theme[free_mid]="#7287fd" -theme[free_end]="#1e66f5" +theme[free_start]="#c6a0f6" +theme[free_mid]="#b7bdf8" +theme[free_end]="#8aadf4" # Mem/Disk cached meter (Sapphire -> Lavender) -theme[cached_start]="#209fb5" -theme[cached_mid]="#1e66f5" -theme[cached_end]="#7287fd" +theme[cached_start]="#7dc4e4" +theme[cached_mid]="#8aadf4" +theme[cached_end]="#b7bdf8" # Mem/Disk available meter (Peach -> Red) -theme[available_start]="#fe640b" -theme[available_mid]="#e64553" -theme[available_end]="#d20f39" +theme[available_start]="#f5a97f" +theme[available_mid]="#ee99a0" +theme[available_end]="#ed8796" # Mem/Disk used meter (Green -> Sky) -theme[used_start]="#40a02b" -theme[used_mid]="#179299" -theme[used_end]="#04a5e5" +theme[used_start]="#a6da95" +theme[used_mid]="#8bd5ca" +theme[used_end]="#91d7e3" # Download graph colors (Peach -> Red) -theme[download_start]="#fe640b" -theme[download_mid]="#e64553" -theme[download_end]="#d20f39" +theme[download_start]="#f5a97f" +theme[download_mid]="#ee99a0" +theme[download_end]="#ed8796" # Upload graph colors (Green -> Sky) -theme[upload_start]="#40a02b" -theme[upload_mid]="#179299" -theme[upload_end]="#04a5e5" +theme[upload_start]="#a6da95" +theme[upload_mid]="#8bd5ca" +theme[upload_end]="#91d7e3" # Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve) -theme[process_start]="#209fb5" -theme[process_mid]="#7287fd" -theme[process_end]="#8839ef" +theme[process_start]="#7dc4e4" +theme[process_mid]="#b7bdf8" +theme[process_end]="#c6a0f6" diff --git a/.config/hypr/assets/images/background.png b/.config/hypr/assets/images/background.png deleted file mode 100644 index df2a0ba..0000000 Binary files a/.config/hypr/assets/images/background.png and /dev/null differ diff --git a/.config/hypr/assets/images/lock-background.png b/.config/hypr/assets/images/lock-background.png new file mode 100644 index 0000000..7018c97 Binary files /dev/null and b/.config/hypr/assets/images/lock-background.png differ diff --git a/.config/hypr/assets/images/lock-latte.png b/.config/hypr/assets/images/lock-latte.png new file mode 100644 index 0000000..9fc6928 Binary files /dev/null and b/.config/hypr/assets/images/lock-latte.png differ diff --git a/.config/hypr/assets/images/lock-macchiato.png b/.config/hypr/assets/images/lock-macchiato.png new file mode 100644 index 0000000..7018c97 Binary files /dev/null and b/.config/hypr/assets/images/lock-macchiato.png differ diff --git a/.config/hypr/assets/images/wall-latte.png b/.config/hypr/assets/images/wall-latte.png new file mode 100644 index 0000000..f8c6dca Binary files /dev/null and b/.config/hypr/assets/images/wall-latte.png differ diff --git a/.config/hypr/assets/images/wall-macchiato.png b/.config/hypr/assets/images/wall-macchiato.png new file mode 100644 index 0000000..c8fda60 Binary files /dev/null and b/.config/hypr/assets/images/wall-macchiato.png differ diff --git a/.config/hypr/conf.d/theme.conf b/.config/hypr/conf.d/theme.conf index 2c244ad..9e7071a 100644 --- a/.config/hypr/conf.d/theme.conf +++ b/.config/hypr/conf.d/theme.conf @@ -1,78 +1,78 @@ -$rosewater = rgb(dc8a78) -$rosewaterAlpha = dc8a78 +$rosewater = rgb(f4dbd6) +$rosewaterAlpha = f4dbd6 -$flamingo = rgb(dd7878) -$flamingoAlpha = dd7878 +$flamingo = rgb(f0c6c6) +$flamingoAlpha = f0c6c6 -$pink = rgb(ea76cb) -$pinkAlpha = ea76cb +$pink = rgb(f5bde6) +$pinkAlpha = f5bde6 -$mauve = rgb(8839ef) -$mauveAlpha = 8839ef +$mauve = rgb(c6a0f6) +$mauveAlpha = c6a0f6 -$red = rgb(d20f39) -$redAlpha = d20f39 +$red = rgb(ed8796) +$redAlpha = ed8796 -$maroon = rgb(e64553) -$maroonAlpha = e64553 +$maroon = rgb(ee99a0) +$maroonAlpha = ee99a0 -$peach = rgb(fe640b) -$peachAlpha = fe640b +$peach = rgb(f5a97f) +$peachAlpha = f5a97f -$yellow = rgb(df8e1d) -$yellowAlpha = df8e1d +$yellow = rgb(eed49f) +$yellowAlpha = eed49f -$green = rgb(40a02b) -$greenAlpha = 40a02b +$green = rgb(a6da95) +$greenAlpha = a6da95 -$teal = rgb(179299) -$tealAlpha = 179299 +$teal = rgb(8bd5ca) +$tealAlpha = 8bd5ca -$sky = rgb(04a5e5) -$skyAlpha = 04a5e5 +$sky = rgb(91d7e3) +$skyAlpha = 91d7e3 -$sapphire = rgb(209fb5) -$sapphireAlpha = 209fb5 +$sapphire = rgb(7dc4e4) +$sapphireAlpha = 7dc4e4 -$blue = rgb(1e66f5) -$blueAlpha = 1e66f5 +$blue = rgb(8aadf4) +$blueAlpha = 8aadf4 -$lavender = rgb(7287fd) -$lavenderAlpha = 7287fd +$lavender = rgb(b7bdf8) +$lavenderAlpha = b7bdf8 -$text = rgb(4c4f69) -$textAlpha = 4c4f69 +$text = rgb(cad3f5) +$textAlpha = cad3f5 -$subtext1 = rgb(5c5f77) -$subtext1Alpha = 5c5f77 +$subtext1 = rgb(b8c0e0) +$subtext1Alpha = b8c0e0 -$subtext0 = rgb(6c6f85) -$subtext0Alpha = 6c6f85 +$subtext0 = rgb(a5adcb) +$subtext0Alpha = a5adcb -$overlay2 = rgb(7c7f93) -$overlay2Alpha = 7c7f93 +$overlay2 = rgb(939ab7) +$overlay2Alpha = 939ab7 -$overlay1 = rgb(8c8fa1) -$overlay1Alpha = 8c8fa1 +$overlay1 = rgb(8087a2) +$overlay1Alpha = 8087a2 -$overlay0 = rgb(9ca0b0) -$overlay0Alpha = 9ca0b0 +$overlay0 = rgb(6e738d) +$overlay0Alpha = 6e738d -$surface2 = rgb(acb0be) -$surface2Alpha = acb0be +$surface2 = rgb(5b6078) +$surface2Alpha = 5b6078 -$surface1 = rgb(bcc0cc) -$surface1Alpha = bcc0cc +$surface1 = rgb(494d64) +$surface1Alpha = 494d64 -$surface0 = rgb(ccd0da) -$surface0Alpha = ccd0da +$surface0 = rgb(363a4f) +$surface0Alpha = 363a4f -$base = rgb(eff1f5) -$baseAlpha = eff1f5 +$base = rgb(24273a) +$baseAlpha = 24273a -$mantle = rgb(e6e9ef) -$mantleAlpha = e6e9ef +$mantle = rgb(1e2030) +$mantleAlpha = 1e2030 -$crust = rgb(dce0e8) -$crustAlpha = dce0e8 +$crust = rgb(181926) +$crustAlpha = 181926 diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index 3b7569b..6a4ccb5 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -14,7 +14,7 @@ general { # BACKGROUND background { monitor = - path = ~/.config/hypr/assets/images/background.png + path = ~/.config/hypr/assets/images/lock-background.png blur_passes = 2 contrast = 0.8916 brightness = 0.8172 diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 2423ecf..4a38b04 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,4 +1,7 @@ +preload = ~/.config/hypr/assets/images/wall-latte.png +preload = ~/.config/hypr/assets/images/wall-macchiato.png preload = ~/.config/hypr/assets/images/wallpaper.png + wallpaper = , ~/.config/hypr/assets/images/wallpaper.png splash = false diff --git a/.config/hypr/scripts/theme-switcher.sh b/.config/hypr/scripts/theme-switcher.sh index c0c00a2..3399102 100755 --- a/.config/hypr/scripts/theme-switcher.sh +++ b/.config/hypr/scripts/theme-switcher.sh @@ -2,13 +2,13 @@ source ~/.zshrc -entries="Macchiato\nLatte" +entries="Dark\nLight" source='source = ~/.config/hypr/themes/' selected=$(echo -e $entries|rofi -dmenu $2 -theme ~/.config/rofi/theme.rasi) case $selected in - Macchiato) + Dark) # GTK gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' gsettings set org.gnome.desktop.interface gtk-theme 'catppuccin-macchiato-blue-standard+default' @@ -17,7 +17,11 @@ case $selected in # ROFI cp ~/.config/rofi/colors/macchiato.rasi ~/.config/rofi/colors/theme.rasi # HYPRLAND + HYPRLOCK + cp ~/.config/hypr/assets/images/lock-macchiato.png ~/.config/hypr/assets/images/lock-background.png cp ~/.config/hypr/themes/macchiato.conf ~/.config/hypr/conf.d/theme.conf + # HYPRPAPER + hyprctl hyprpaper wallpaper "DP-3,~/.config/hypr/assets/images/wall-macchiato.png" + cp ~/.config/hypr/assets/images/wall-macchiato.png ~/.config/hypr/assets/images/wallpaper.png # HYPRPANEL ags -r "useTheme('$HOME/.config/ags/themes/catppuccin_macchiato.json')" > /dev/null # KITTY + ZSH + NVIM @@ -33,7 +37,7 @@ case $selected in # OBS sed -i 's/^Theme=.*/Theme=com.obsproject.Catppuccin.Macchiato/' ~/.config/obs-studio/global.ini ;; - Latte) + Light) # GTK gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' gsettings set org.gnome.desktop.interface gtk-theme 'catppuccin-latte-blue-standard+default' @@ -43,6 +47,10 @@ case $selected in cp ~/.config/rofi/colors/latte.rasi ~/.config/rofi/colors/theme.rasi # HYPRLAND + HYPRLOCK cp ~/.config/hypr/themes/latte.conf ~/.config/hypr/conf.d/theme.conf + cp ~/.config/hypr/assets/images/lock-latte.png ~/.config/hypr/assets/images/lock-background.png + # HYPRPAPER + hyprctl hyprpaper wallpaper "DP-3,~/.config/hypr/assets/images/wall-latte.png" + cp ~/.config/hypr/assets/images/wall-latte.png ~/.config/hypr/assets/images/wallpaper.png # HYPRPANEL ags -r "useTheme('$HOME/.config/ags/themes/catppuccin_latte.json')" > /dev/null # KITTY + ZSH + NVIM diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf index e3fb955..a45b09f 100644 --- a/.config/kitty/current-theme.conf +++ b/.config/kitty/current-theme.conf @@ -1,80 +1,80 @@ # vim:ft=kitty -## name: Catppuccin-Latte +## name: Catppuccin-Macchiato ## author: Pocco81 (https://github.com/Pocco81) ## license: MIT -## upstream: https://github.com/catppuccin/kitty/blob/main/latte.conf +## upstream: https://github.com/catppuccin/kitty/blob/main/macchiato.conf ## blurb: Soothing pastel theme for the high-spirited! # The basic colors -foreground #4C4F69 -background #EFF1F5 -selection_foreground #EFF1F5 -selection_background #DC8A78 +foreground #CAD3F5 +background #24273A +selection_foreground #24273A +selection_background #F4DBD6 # Cursor colors -cursor #DC8A78 -cursor_text_color #EFF1F5 +cursor #F4DBD6 +cursor_text_color #24273A # URL underline color when hovering with mouse -url_color #DC8A78 +url_color #F4DBD6 # Kitty window border colors -active_border_color #7287FD -inactive_border_color #9CA0B0 -bell_border_color #DF8E1D +active_border_color #B7BDF8 +inactive_border_color #6E738D +bell_border_color #EED49F # OS Window titlebar colors wayland_titlebar_color system macos_titlebar_color system # Tab bar colors -active_tab_foreground #EFF1F5 -active_tab_background #8839EF -inactive_tab_foreground #4C4F69 -inactive_tab_background #9CA0B0 -tab_bar_background #BCC0CC +active_tab_foreground #181926 +active_tab_background #C6A0F6 +inactive_tab_foreground #CAD3F5 +inactive_tab_background #1E2030 +tab_bar_background #181926 # Colors for marks (marked text in the terminal) -mark1_foreground #EFF1F5 -mark1_background #7287fD -mark2_foreground #EFF1F5 -mark2_background #8839EF -mark3_foreground #EFF1F5 -mark3_background #209FB5 +mark1_foreground #24273A +mark1_background #B7BDF8 +mark2_foreground #24273A +mark2_background #C6A0F6 +mark3_foreground #24273A +mark3_background #7DC4E4 # The 16 terminal colors # black -color0 #5C5F77 -color8 #6C6F85 +color0 #494D64 +color8 #5B6078 # red -color1 #D20F39 -color9 #D20F39 +color1 #ED8796 +color9 #ED8796 # green -color2 #40A02B -color10 #40A02B +color2 #A6DA95 +color10 #A6DA95 # yellow -color3 #DF8E1D -color11 #DF8E1D +color3 #EED49F +color11 #EED49F # blue -color4 #1E66F5 -color12 #1E66F5 +color4 #8AADF4 +color12 #8AADF4 # magenta -color5 #EA76CB -color13 #EA76CB +color5 #F5BDE6 +color13 #F5BDE6 # cyan -color6 #179299 -color14 #179299 +color6 #8BD5CA +color14 #8BD5CA # white -color7 #ACB0BE -color15 #BCC0CC +color7 #B8C0E0 +color15 #A5ADCB diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index cee0821..746e4fc 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,5 +1,5 @@ # BEGIN_KITTY_THEME -# Catppuccin-Latte +# Catppuccin-Macchiato include current-theme.conf # END_KITTY_THEME diff --git a/.config/kitty/kitty.conf.bak b/.config/kitty/kitty.conf.bak index 746e4fc..cee0821 100644 --- a/.config/kitty/kitty.conf.bak +++ b/.config/kitty/kitty.conf.bak @@ -1,5 +1,5 @@ # BEGIN_KITTY_THEME -# Catppuccin-Macchiato +# Catppuccin-Latte include current-theme.conf # END_KITTY_THEME diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index de110b8..560f08e 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -22,7 +22,7 @@ require "user.options" require "user.keymaps" require("catppuccin").setup { - flavour = "latte", + flavour = "macchiato", } -- setup must be called before loading diff --git a/.config/rofi/colors/theme.rasi b/.config/rofi/colors/theme.rasi index 4ec7b27..f2e45d6 100644 --- a/.config/rofi/colors/theme.rasi +++ b/.config/rofi/colors/theme.rasi @@ -7,10 +7,10 @@ **/ * { - background: #eff1f5; - background-alt: #e6e9ef; - foreground: #9ca0b0; - selected: #1e66f5; - active: #40a02b; - urgent: #d20f39; + background: #24273a; + background-alt: #1e2030; + foreground: #6c7086; + selected: #8aadf4; + active: #a6da95; + urgent: #ed8796; } diff --git a/.config/zathura/theme b/.config/zathura/theme index 3f38e5c..599520e 100644 --- a/.config/zathura/theme +++ b/.config/zathura/theme @@ -1,38 +1,38 @@ -set default-fg rgba(76,79,105,1) -set default-bg rgba(239,241,245,1) +set default-fg rgba(202,211,245,1) +set default-bg rgba(36,39,58,1) -set completion-bg rgba(204,208,218,1) -set completion-fg rgba(76,79,105,1) +set completion-bg rgba(54,58,79,1) +set completion-fg rgba(202,211,245,1) set completion-highlight-bg rgba(87,82,104,1) -set completion-highlight-fg rgba(76,79,105,1) -set completion-group-bg rgba(204,208,218,1) -set completion-group-fg rgba(30,102,245,1) +set completion-highlight-fg rgba(202,211,245,1) +set completion-group-bg rgba(54,58,79,1) +set completion-group-fg rgba(138,173,244,1) -set statusbar-fg rgba(76,79,105,1) -set statusbar-bg rgba(204,208,218,1) +set statusbar-fg rgba(202,211,245,1) +set statusbar-bg rgba(54,58,79,1) -set notification-bg rgba(204,208,218,1) -set notification-fg rgba(76,79,105,1) -set notification-error-bg rgba(204,208,218,1) -set notification-error-fg rgba(210,15,57,1) -set notification-warning-bg rgba(204,208,218,1) +set notification-bg rgba(54,58,79,1) +set notification-fg rgba(202,211,245,1) +set notification-error-bg rgba(54,58,79,1) +set notification-error-fg rgba(237,135,150,1) +set notification-warning-bg rgba(54,58,79,1) set notification-warning-fg rgba(250,227,176,1) -set inputbar-fg rgba(76,79,105,1) -set inputbar-bg rgba(204,208,218,1) +set inputbar-fg rgba(202,211,245,1) +set inputbar-bg rgba(54,58,79,1) set recolor "true" -set recolor-lightcolor rgba(239,241,245,1) -set recolor-darkcolor rgba(76,79,105,1) +set recolor-lightcolor rgba(36,39,58,1) +set recolor-darkcolor rgba(202,211,245,1) -set index-fg rgba(76,79,105,1) -set index-bg rgba(239,241,245,1) -set index-active-fg rgba(76,79,105,1) -set index-active-bg rgba(204,208,218,1) +set index-fg rgba(202,211,245,1) +set index-bg rgba(36,39,58,1) +set index-active-fg rgba(202,211,245,1) +set index-active-bg rgba(54,58,79,1) -set render-loading-bg rgba(239,241,245,1) -set render-loading-fg rgba(76,79,105,1) +set render-loading-bg rgba(36,39,58,1) +set render-loading-fg rgba(202,211,245,1) set highlight-color rgba(87,82,104,0.5) -set highlight-fg rgba(234,118,203,0.5) -set highlight-active-color rgba(234,118,203,0.5) +set highlight-fg rgba(245,189,230,0.5) +set highlight-active-color rgba(245,189,230,0.5) diff --git a/.zshrc b/.zshrc index cf4657d..0ce305f 100644 --- a/.zshrc +++ b/.zshrc @@ -136,6 +136,10 @@ export PATH="$DENO_INSTALL/bin:$PATH" export BUN_INSTALL="$HOME/.bun" export PATH="$BUN_INSTALL/bin:$PATH" +# cargo +export CARGO_INSTALL="$HOME/.cargo" +export PATH="$CARGO_INSTALL/bin:$PATH" + # dotnet export DOTNET_ROOT=$HOME/.dotnet